diff options
| author | redmatrix <git@macgirvin.com> | 2016-06-19 19:12:33 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-06-19 19:12:33 -0700 |
| commit | fb61c4fb3497d3751bb43f12cadee9e9c7776be9 (patch) | |
| tree | 604989e10424456783fccff1fccc5b14da26db7f /Zotlabs/Module/Notify.php | |
| parent | bfaabfb7b5ff639992a01b0e1fc374cd43d536e9 (diff) | |
| parent | 4578649f758e65f1d87ebb98da7cd891d0b90d0d (diff) | |
| download | volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.gz volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.tar.bz2 volse-hubzilla-fb61c4fb3497d3751bb43f12cadee9e9c7776be9.zip | |
Merge branch '1.8RC'
Diffstat (limited to 'Zotlabs/Module/Notify.php')
| -rw-r--r-- | Zotlabs/Module/Notify.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Notify.php b/Zotlabs/Module/Notify.php index 227491145..f592f6f37 100644 --- a/Zotlabs/Module/Notify.php +++ b/Zotlabs/Module/Notify.php @@ -39,7 +39,7 @@ class Notify extends \Zotlabs\Web\Controller { $not_tpl = get_markup_template('notify.tpl'); require_once('include/bbcode.php'); - $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", + $r = q("SELECT * from notify where uid = %d and seen = 0 order by created desc", intval(local_channel()) ); @@ -49,7 +49,7 @@ class Notify extends \Zotlabs\Web\Controller { '$item_link' => z_root().'/notify/view/'. $it['id'], '$item_image' => $it['photo'], '$item_text' => strip_tags(bbcode($it['msg'])), - '$item_when' => relative_date($it['date']) + '$item_when' => relative_date($it['created']) )); } } |