diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-18 13:14:34 -0700 |
commit | 51db7536380d70e2047aa91c3a12809cc3444aa8 (patch) | |
tree | 359c67869e57a5c42aed637f63c2dd7953bddbb7 /mod/display.php | |
parent | e271035879660bc9996101f3a23d61c88ecd5f53 (diff) | |
parent | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (diff) | |
download | volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.gz volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.tar.bz2 volse-hubzilla-51db7536380d70e2047aa91c3a12809cc3444aa8.zip |
Merge branch 'tres'
Diffstat (limited to 'mod/display.php')
-rw-r--r-- | mod/display.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/display.php b/mod/display.php index b5daea2de..33fb83e70 100644 --- a/mod/display.php +++ b/mod/display.php @@ -81,7 +81,7 @@ function display_content(&$a, $update = 0, $load = false) { $target_item = null; - $r = q("select id, uid, mid, parent_mid, item_restrict from item where mid like '%s' limit 1", + $r = q("select id, uid, mid, parent_mid, item_type, item_deleted from item where mid like '%s' limit 1", dbesc($item_hash . '%') ); @@ -91,7 +91,7 @@ function display_content(&$a, $update = 0, $load = false) { $r = null; - if($target_item['item_restrict'] & ITEM_WEBPAGE) { + if($target_item['item_type'] == ITEM_TYPE_WEBPAGE) { $x = q("select * from channel where channel_id = %d limit 1", intval($target_item['uid']) ); @@ -247,7 +247,7 @@ function display_content(&$a, $update = 0, $load = false) { } if($updateable) { - $x = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1 AND uid = %d and parent = %d ", + $x = q("UPDATE item SET item_unseen = 0 where item_unseen = 1 AND uid = %d and parent = %d ", intval(local_channel()), intval($r[0]['parent']) ); @@ -266,7 +266,7 @@ function display_content(&$a, $update = 0, $load = false) { dbesc($item_hash) ); if($r) { - if($r[0]['item_flags'] & ITEM_DELETED) { + if(intval($r[0]['item_deleted'])) { notice( t('Item has been removed.') . EOL ); } else { |