diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-06 04:51:15 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-06 04:51:15 -0400 |
| commit | 7e7372fc5af41bb1af125e4d4e92cb7701e56faa (patch) | |
| tree | 9b3f2ae85a81c7983f6595679a370fc5a6815f1e /mod/message.php | |
| parent | 0c4099966a5ac1f1ff5dc568a600aa57776fb752 (diff) | |
| parent | 47c3b43afd64cd1c05b67d347fb1219c42fe6d20 (diff) | |
| download | volse-hubzilla-7e7372fc5af41bb1af125e4d4e92cb7701e56faa.tar.gz volse-hubzilla-7e7372fc5af41bb1af125e4d4e92cb7701e56faa.tar.bz2 volse-hubzilla-7e7372fc5af41bb1af125e4d4e92cb7701e56faa.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
bad sql left after the mailbox in/out merge
* master:
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/message.php b/mod/message.php index dbca45930..aa8851e46 100644 --- a/mod/message.php +++ b/mod/message.php @@ -198,7 +198,7 @@ function message_content(&$a) { $o .= $header; $r = q("SELECT count(*) AS `total` FROM `mail` - WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC", + WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC", intval(local_user()), dbesc($myprofile) ); |