diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-13 09:46:42 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-02-13 09:46:42 +0100 |
| commit | 850560519a4bbe9949368933e115f767aeb90b73 (patch) | |
| tree | 6f162b4b0130a5f829d40f7ebd9d18442ad18921 /mod/network.php | |
| parent | 16d3bc9deb5cb80f438a53f1bf483c79351674af (diff) | |
| parent | 85c831bcbf6f4cc2793d91e4e3fb3da5828a3f60 (diff) | |
| download | volse-hubzilla-850560519a4bbe9949368933e115f767aeb90b73.tar.gz volse-hubzilla-850560519a4bbe9949368933e115f767aeb90b73.tar.bz2 volse-hubzilla-850560519a4bbe9949368933e115f767aeb90b73.zip | |
Merge remote-tracking branch 'friendica/master' into mobile
Diffstat (limited to 'mod/network.php')
| -rwxr-xr-x | mod/network.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index 497e8a115..8f10ace77 100755 --- a/mod/network.php +++ b/mod/network.php @@ -56,7 +56,9 @@ function saved_searches($search) { . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '') . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '') - . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : ''); + . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : ''); $o = ''; @@ -222,6 +224,8 @@ function network_content(&$a, $update = 0) { $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); $nets = ((x($_GET,'nets')) ? $_GET['nets'] : ''); + $cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0); + $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99); if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -358,6 +362,8 @@ function network_content(&$a, $update = 0) { . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') . ((x($_GET,'spam')) ? '&spam=' . $_GET['spam'] : '') . ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '') . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n"; } |