Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 02:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pm replies

Browse source
This commit is contained in:
friendica 2011-12-06 19:15:42 -08:00
parent 0c24784f5e
commit 7eba8adbf7
8 changed files with 158 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mod/message.php
View file

@ -217,11 +217,19 @@ function message_content(&$a) {
);
if(count($r)) {
$contact_id = $r[0]['contact-id'];
$convid = $r[0]['convid'];
$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
if($convid)
$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
dbesc($r[0]['parent-uri']),
intval($convid)
);
$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d AND `mail`.`parent-uri` = '%s' ORDER BY `mail`.`created` ASC",
intval(local_user()),
dbesc($r[0]['parent-uri'])
WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
intval(local_user())
);
}
if(! count($messages)) {