diff options
| -rw-r--r-- | include/main.js | 4 | ||||
| -rw-r--r-- | mod/network.php | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/main.js b/include/main.js index 288fd6f01..0e9c6ee75 100644 --- a/include/main.js +++ b/include/main.js @@ -149,8 +149,8 @@ prev = 'live-' + src; in_progress = true; - var udargs = ((netargs.length) ? '/' + netargs : ''); - var update_url = 'update_' + src + udargs + '?p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); + var udargs = ((netargs.length) ? '/?f=' + netargs : '?f='); + var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&msie=' + ((msie) ? 1 : 0); $.get(update_url,function(data) { in_progress = false; diff --git a/mod/network.php b/mod/network.php index 28e540283..f05bf3e34 100644 --- a/mod/network.php +++ b/mod/network.php @@ -125,10 +125,10 @@ 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) + . ((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 +208,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 |