diff options
| -rw-r--r-- | boot.php | 1 | ||||
| -rw-r--r-- | mod/display.php | 2 | ||||
| -rw-r--r-- | mod/network.php | 17 |
3 files changed, 6 insertions, 14 deletions
@@ -472,7 +472,6 @@ if(! class_exists('App')) { public $cid; public $contact; public $contacts; - public $page_contact; public $content; public $data = array(); public $error = false; diff --git a/mod/display.php b/mod/display.php index d109d9a9b..1fdac9c2c 100644 --- a/mod/display.php +++ b/mod/display.php @@ -109,8 +109,6 @@ function display_content(&$a) { // $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", // intval($a->profile['uid']) // ); -// if(count($r)) -// $a->page_contact = $r[0]; // $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); diff --git a/mod/network.php b/mod/network.php index cca69dc52..04390d3f1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -674,26 +674,21 @@ function network_content(&$a, $update = 0, $load = false) { else { $items = array(); } + + if($parents_str) + $update_unseen = ' AND parent IN ( ' . dbesc($parents_str) . ' )'; + } // logger('items: ' . count($items)); - // We aren't going to try and figure out at the item, group, and page - // level which items you've seen and which you haven't. If you're looking - // at the top level network page just mark everything seen. - - if((! $group) && (! $cid) && (! $star)) { + if($update_unseen) $r = q("UPDATE `item` SET item_flags = ( item_flags ^ %d) - WHERE (item_flags & %d) AND `uid` = %d", + WHERE (item_flags & %d) AND `uid` = %d $update_unseen ", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(local_user()) ); - } - -// fixme - // Set this so that the conversation function can find out contact info for our wall-wall items - $a->page_contact = $a->contact; $mode = (($nouveau) ? 'network-new' : 'network'); |