diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-06-03 11:04:16 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-06-03 11:04:16 +0200 |
commit | 25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (patch) | |
tree | e448899f37eb48e6ee2a5ffdb4fd55bf5e9a779b /Zotlabs/Module/Notify.php | |
parent | b4eb9f2a1142cf121dd41ea0ad81475d38343308 (diff) | |
parent | 8d6c2b5d4a799d87df1cd9f6f258890045ce6c62 (diff) | |
download | volse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.tar.gz volse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.tar.bz2 volse-hubzilla-25aded6b9b137a32d9f9ea68baf3e2102fb293e7.zip |
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
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']) )); } } |