don't add notification details on new posts

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 28e5402834b0e7dc2c565cd37f18acbd78ddcfbe..cf4c994f0dd0a5324282ef1470730aaef98ada1a 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -98,7 +98,7 @@ function network_content(&$a, $update = 0) {
                        }
                }
 
-               $o .= '<script> $(document).ready(function() { $(\'#nav-network-link\').addClass(\'nav-selected\'); });</script>';
+               nav_set_selected('network');
 
                $_SESSION['return_url'] = $a->cmd;
 
@@ -125,10 +125,11 @@ function network_content(&$a, $update = 0) {
 
                        $o .= '<div id="live-network"></div>' . "\r\n";
                        $o .= "<script> var profile_uid = " . $_SESSION['uid'] 
-                               . "; var netargs = '" . substr($a->cmd,8) 
-                               . ((x($_GET,'cid')) ? '?cid=' . $_GET['cid'] : '')
-                               . ((x($_GET,'search')) ? '?search=' . $_GET['search'] : '') 
-                               . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') 
+                               . "; var netargs = '" . substr($a->cmd,8)
+                               . '?f='
+                               . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '')
+                               . ((x($_GET,'search')) ? '&search=' . $_GET['search'] : '') 
+                               . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') 
                                . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 
        }
@@ -208,7 +209,6 @@ function network_content(&$a, $update = 0) {
                $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' ";
 
        
-
        $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`.`deleted` = 0
@@ -297,9 +297,8 @@ function network_content(&$a, $update = 0) {
        $o .= conversation($a,$r,$mode,$update);
 
        if(! $update) {
-
                $o .= paginate($a);
-               $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+               $o .= cc_license();
        }
 
        return $o;