diff options
| author | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
| commit | c95deb48398a23de68a3d438b5fffeaea3f3fa01 (patch) | |
| tree | f9e7d080dd0e32d876cb07409b4f8dc1b550b10b /mod/message.php | |
| parent | f03c57007a2a9ec73902acfb2d951528e68e3117 (diff) | |
| parent | 0bf9595ab19f3af772d20a88eac86dc8cf962c3e (diff) | |
| download | volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.gz volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.bz2 volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.zip | |
Merge pull request #134 from simonlnu/master
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
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']), |