Merge branch 'config' into ipv6-dnsbl

js/mod/recent-posts-auto-reload.js

@@ -101,7 +101,7 @@ $(document).ready(function(){
     // Grab the settings
     var settings = new script_settings('auto-reload-mod');
     var poll_interval_mindelay        = settings.get('min_delay_bottom', 5000);
-    var poll_interval_maxdelay        = settings.get('max_delay', 600000);
+    var poll_interval_maxdelay        = settings.get('max_delay', 10000);
     var poll_interval_errordelay      = settings.get('error_delay', 30000);
 
     // number of ms to wait before reloading

templates/themes/categories/theme.php

@@ -148,7 +148,7 @@
             return $stats;
         }
 
-        private static function countUniqueIps($markAsCounted, $timespan, $_board) {
+        private static function countUniqueIps(&$markAsCounted, $timespan, $_board) {
         	$unique_query = query(
             	sprintf("SELECT DISTINCT ip FROM ``posts_%s`` WHERE time > %d",
                             $_board['uri'],