Fix cyclic threads not cycling, remove inconsistent code whitespace

inc/config.php

@@ -2,7 +2,7 @@
 
 /*
  *  Copyright (c) 2010-2013 Tinyboard Development Group
- *  
+ *
  *  WARNING: This is a project-wide configuration file and is overwritten when upgrading to a newer
  *  version of Tinyboard. Please leave this file unchanged, or it will be a lot harder for you to upgrade.
  *  If you would like to make instance-specific changes to your own setup, please use instance-config.php.
@@ -258,7 +258,7 @@
 
     // How soon after regeneration do hashes expire (in seconds)?
     $config['spam']['hidden_inputs_expire'] = 60 * 60 * 3; // three hours
-    
+
     // Whether to use Unicode characters in hidden input names and values.
     $config['spam']['unicode'] = true;
 
@@ -317,7 +317,7 @@
     // Public and private key pair from https://www.google.com/recaptcha/admin/create
     $config['recaptcha_public'] = '6LcXTcUSAAAAAKBxyFWIt2SO8jwx4W7wcSMRoN3f';
     $config['recaptcha_private'] = '6LcXTcUSAAAAAOGVbVdhmEM1_SyRF4xTKe8jbzf_';
-    
+
     // Ability to lock a board for normal users and still allow mods to post.  Could also be useful for making an archive board
     $config['board_locked'] = false;
 
@@ -474,7 +474,7 @@
     //  ),
     //  'action' => 'reject'
     // );
-    
+
     // Filter flood prevention conditions ("flood-match") depend on a table which contains a cache of recent
     // posts across all boards. This table is automatically purged of older posts, determining the maximum
     // "age" by looking at each filter. However, when determining the maximum age, Tinyboard does not look
@@ -560,9 +560,9 @@
     $config['markup_urls'] = true;
 
     // Optional URL prefix for links (eg. "http://anonym.to/?").
-    $config['link_prefix'] = ''; 
+    $config['link_prefix'] = '';
     $config['url_ads'] = &$config['link_prefix'];    // leave alias
-    
+
     // Allow "uploading" images via URL as well. Users can enter the URL of the image and then Tinyboard will
     // download it. Not usually recommended.
     $config['allow_upload_by_url'] = false;
@@ -580,7 +580,7 @@
     // as they are submitted and changes or censors particular words or phrases.
 
     // For a normal string replacement:
-    // $config['wordfilters'][] = array('cat', 'dog');  
+    // $config['wordfilters'][] = array('cat', 'dog');
     // Advanced raplcement (regular expressions):
     // $config['wordfilters'][] = array('/ca[rt]/', 'dog', true); // 'true' means it's a regular expression
 
@@ -632,7 +632,7 @@
     // that you will have to disable BOTH country_flags and contry_flags_condensed optimization (at least on a board
     // where they are enabled).
     $config['user_flag'] = false;
-    
+
     // List of user_flag the user can choose. Flags must be placed in the directory set by $config['uri_flags']
     $config['user_flags'] = array();
     /* example: 
@@ -649,7 +649,7 @@
 
     // Use semantic URLs for threads, like /b/res/12345/daily-programming-thread.html
     $config['slugify'] = false;
-    
+
     // Max size for slugs
     $config['slug_max_size'] = 80;
 
@@ -723,10 +723,10 @@
     // $config['additional_javascript'][] = 'js/file-selector.js';
     $config['max_images'] = 1;
 
-    // Method to use for determing the max filesize. 
+    // Method to use for determing the max filesize.
     // "split" means that your max filesize is split between the images. For example, if your max filesize
-    // is 2MB, the filesizes of all files must add up to 2MB for it to work. 
+    // is 2MB, the filesizes of all files must add up to 2MB for it to work.
-    // "each" means that each file can be 2MB, so if your max_images is 3, each post could contain 6MB of 
+    // "each" means that each file can be 2MB, so if your max_images is 3, each post could contain 6MB of
     // images. "split" is recommended.
     $config['multiimage_method'] = 'split';
 
@@ -780,18 +780,18 @@
     // Ignored when $config['redraw_image'] is true. This is also used to adjust the Orientation tag when
     //  $config['strip_exif'] is false and $config['convert_manual_orient'] is true.
     $config['use_exiftool'] = false;
-    
+
     // Redraw the image to strip any excess data (commonly ZIP archives) WARNING: This might strip the
     // animation of GIFs, depending on the chosen thumbnailing method. It also requires recompressing
     // the image, so more processing power is required.
     $config['redraw_image'] = false;
-    
+
     // Automatically correct the orientation of JPEG files using -auto-orient in `convert`. This only works
     // when `convert` or `gm` is selected for thumbnailing. Again, requires more processing power because
     // this basically does the same thing as $config['redraw_image']. (If $config['redraw_image'] is enabled,
     // this value doesn't matter as $config['redraw_image'] attempts to correct orientation too.)
     $config['convert_auto_orient'] = false;
-    
+
     // Is your version of ImageMagick or GraphicsMagick old? Older versions may not include the -auto-orient
     // switch. This is a manual replacement for that switch. This is independent from the above switch;
     // -auto-orrient is applied when thumbnailing too.
@@ -873,7 +873,7 @@
     $config['image_identification_google'] = true;
     // Anime/manga search engine.
     $config['image_identification_iqdb'] = false;
-    
+
     // Set this to true if you're using a BSD
     $config['bsd_md5'] = false;
 
@@ -1071,7 +1071,7 @@
     // $config['additional_javascript'][] = 'js/auto-reload.js';
     // $config['additional_javascript'][] = 'js/post-hover.js';
     // $config['additional_javascript'][] = 'js/style-select.js';
-    
+
     // Defer some additional Javascript for faster initial page load times. Defering may break some scripts.
     // To enable, set this to true and add the scripts you want to defer to $config['additional_javascript_defer'].
     // If using $config['additional_javascript_compile'], this will be ignored and no files will be deferred.
@@ -1294,8 +1294,8 @@
 
     // Website favicon.
     // $config['url_favicon'] = '/favicon.gif';
-    
+
-    // Website  Apple touch icon.
+    // Website Apple touch icon.
     // $config['url_appletouchicon'] = '/favicon.gif';
 
     // Try not to build pages when we shouldn't have to.
@@ -1554,7 +1554,7 @@
     $config['mod']['sticky'] = MOD;
     // Cycle a thread
     $config['mod']['cycle'] = MOD;
-    $config['cycle_limit'] = &$config['reply_limit'];
+    $config['cycle_limit'] = 250;
     // Lock a thread
     $config['mod']['lock'] = MOD;
     // Post in a locked thread
@@ -1684,21 +1684,21 @@
         'convert_args',
         'db>password',
     );
-    
+
     $config['mod']['config'][JANITOR] = array(
         '!', // Allow editing ONLY the variables listed (in this case, nothing).
     );
-    
+
     $config['mod']['config'][MOD] = array(
         '!', // Allow editing ONLY the variables listed (plus that in $config['mod']['config'][JANITOR]).
         'global_message',
     );
-    
+
     // Example: Disallow ADMIN from editing (and viewing) $config['db']['password'].
     // $config['mod']['config'][ADMIN] = array(
     //  'db>password',
     // );
-    
+
     // Example: Allow ADMIN to edit anything other than $config['db']
     // (and $config['mod']['config'][DISABLED]).
     // $config['mod']['config'][ADMIN] = array(
@@ -1738,7 +1738,7 @@
 
     // Limit of search results
     $config['search']['search_limit'] = 100;
-        
+
     // Boards for searching
     //$config['search']['boards'] = array('a', 'b', 'c', 'd', 'e');