diff options
author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-29 17:23:09 +0200 |
---|---|---|
committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-07-29 17:23:09 +0200 |
commit | ac6945eed1644e7a9e58c5f74dae696ff0f09d72 (patch) | |
tree | b3b13f5569869a2feffb3990ea8e33313f789e5e /mod/network.php | |
parent | b1e766dadb1d4a9e727b2d1d5f32442392ac6bd3 (diff) | |
parent | f47d582736ddf24528dd514850d4bed76783f589 (diff) | |
download | volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.gz volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.tar.bz2 volse-hubzilla-ac6945eed1644e7a9e58c5f74dae696ff0f09d72.zip |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'mod/network.php')
-rw-r--r-- | mod/network.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mod/network.php b/mod/network.php index 28e540283..7bdd3f3f1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -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 |