aboutsummaryrefslogtreecommitdiffstats
path: root/include/notify.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-18 13:14:34 -0700
commit51db7536380d70e2047aa91c3a12809cc3444aa8 (patch)
tree359c67869e57a5c42aed637f63c2dd7953bddbb7 /include/notify.php
parente271035879660bc9996101f3a23d61c88ecd5f53 (diff)
parent7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff)
downloadvolse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2
volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip
Merge branch 'tres'
Diffstat (limited to 'include/notify.php')
-rw-r--r--include/notify.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/notify.php b/include/notify.php
index eef838664..2b032b56b 100644
--- a/include/notify.php
+++ b/include/notify.php
@@ -5,9 +5,6 @@ function format_notification($item) {
$ret = '';
-// return array();
-
-
require_once('include/conversation.php');
// Call localize_item with the "brief" flag to get a one line status for activities.
@@ -19,7 +16,7 @@ function format_notification($item) {
$itemem_text = $item['localize'];
}
else {
- $itemem_text = (($item['item_flags'] & ITEM_THREAD_TOP)
+ $itemem_text = (($item['item_thread_top'])
? t('created a new post')
: sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name']));
}