diff options
| -rw-r--r-- | include/socgraph.php | 30 | ||||
| -rw-r--r-- | mod/network.php | 6 | ||||
| -rw-r--r-- | mod/notes.php | 4 | ||||
| -rw-r--r-- | view/theme/slackr/theme.php | 1 |
4 files changed, 25 insertions, 16 deletions
diff --git a/include/socgraph.php b/include/socgraph.php index 592779089..eccb133cc 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) { $name = $entry->displayName; - foreach($entry->urls as $url) { - if($url->type == 'profile') { - $profile_url = $url->value; - continue; - } - if($url->type == 'webfinger') { - $connect_url = str_replace('acct:' , '', $url->value); - continue; + if(isset($entry->urls)) { + foreach($entry->urls as $url) { + if($url->type == 'profile') { + $profile_url = $url->value; + continue; + } + if($url->type == 'webfinger') { + $connect_url = str_replace('acct:' , '', $url->value); + continue; + } } - } - foreach($entry->photos as $photo) { - if($photo->type == 'profile') { - $profile_photo = $photo->value; - continue; + } + if(isset($entry->photos)) { + foreach($entry->photos as $photo) { + if($photo->type == 'profile') { + $profile_photo = $photo->value; + continue; + } } } diff --git a/mod/network.php b/mod/network.php index e59839ccc..f43eeb67e 100644 --- a/mod/network.php +++ b/mod/network.php @@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) { return login(false); } + $arr = array('query' => $a->query_string); + + call_hooks('network_content_init', $arr); + $o = ''; // item filter tabs @@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) { $all_active = 'active'; } - + $postord_active = ''; if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') { diff --git a/mod/notes.php b/mod/notes.php index e6e2b44fb..0072ce447 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ", intval(local_user()) @@ -96,7 +96,7 @@ function notes_content(&$a,$update = false) { $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 $sql_extra ORDER BY `item`.`created` DESC LIMIT %d ,%d ", diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php index 99e061a2f..516132f5c 100644 --- a/view/theme/slackr/theme.php +++ b/view/theme/slackr/theme.php @@ -45,6 +45,7 @@ function cmtBbClose(id) { } $(document).ready(function() { + $('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('.group-edit-icon').hover( |