diff options
| author | friendica <info@friendica.com> | 2012-03-13 15:41:13 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-13 15:41:13 -0700 |
| commit | 427362c324e5acfad18c72108a59a9e6e5b58550 (patch) | |
| tree | 7046e107ea723a917959606bfc4c41d2c8ccd2b7 /mod/message.php | |
| parent | dc84da520d7bde3f2e160d2573a549829fd022cf (diff) | |
| parent | acc4bbeb6ebc832da2a8b5a37b764a6a53dd1214 (diff) | |
| download | volse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.tar.gz volse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.tar.bz2 volse-hubzilla-427362c324e5acfad18c72108a59a9e6e5b58550.zip | |
Merge branch 'pull'
Diffstat (limited to 'mod/message.php')
| -rwxr-xr-x | mod/message.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/message.php b/mod/message.php index 57d45ee3c..37f92e8d9 100755 --- a/mod/message.php +++ b/mod/message.php @@ -192,7 +192,7 @@ 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 ", intval(local_user()), |