diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
| commit | 4fcdada4320d5d5619eb3a1f517d0fea6b26857b (patch) | |
| tree | bc2ba3aac0a08c1464718f688be8080d0dff6d2c /mod/message.php | |
| parent | 5bae7159cc7b182e40229bb6d547ccf303eb4282 (diff) | |
| parent | fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313 (diff) | |
| download | volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.gz volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.bz2 volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/message.php')
| -rwxr-xr-x | mod/message.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/message.php b/mod/message.php index 57d45ee3c..65f692f3d 100755 --- a/mod/message.php +++ b/mod/message.php @@ -192,9 +192,9 @@ function message_content(&$a) { $a->set_pager_total($r[0]['total']); $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, - `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` + `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network` FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` - WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC LIMIT %d , %d ", + WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ", intval(local_user()), dbesc($myprofile), intval($a->pager['start']), |