aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2014-06-03 16:05:23 +0100
committerThomas Willingham <founder@kakste.com>2014-06-03 16:05:23 +0100
commit5f6f2bb9b1a93ead1333b2e60054e48d2cb9dc58 (patch)
treec16c4d36a4ffcfcdb3ca826e8c25b3f63bbbf3cb
parent5abd8fa70262627ed71ebf91b3bcdf0f0f03532e (diff)
downloadvolse-hubzilla-5f6f2bb9b1a93ead1333b2e60054e48d2cb9dc58.tar.gz
volse-hubzilla-5f6f2bb9b1a93ead1333b2e60054e48d2cb9dc58.tar.bz2
volse-hubzilla-5f6f2bb9b1a93ead1333b2e60054e48d2cb9dc58.zip
Revert that - sorry, pushed to the wrong repo. We probably want that
in the long term, but this was a quick hack - you can't override a pconfig yet.
-rw-r--r--mod/network.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index 916ac7ad8..8202b1044 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -99,8 +99,7 @@ function network_content(&$a, $update = 0, $load = false) {
$conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0);
$spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0);
$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
- $cmax = get_pconfig(local_user(), system, cmax);
- if (! $cmax) $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
+ $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
$firehose = ((x($_GET,'fh')) ? intval($_GET['fh']) : 0);
$file = ((x($_GET,'file')) ? $_GET['file'] : '');