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.
This commit is contained in:
Thomas Willingham 2014-06-03 16:05:23 +01:00
parent 5abd8fa702
commit 5f6f2bb9b1

View File

@ -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'] : '');