Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	stylesheets/dark.css
	stylesheets/futaba+vichan.css
	stylesheets/miku.css
	stylesheets/stripes.css
	stylesheets/testorange.css
	stylesheets/wasabi.css

1 files changed, 7 insertions, 7 deletions

diff --git a/inc/config.php b/inc/config.php
index cb3f528b..9d958693 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -417,9 +417,9 @@
 	// Thumbnail extension, empty for inherited (png recommended)
 	$config['thumb_ext'] = 'png';
 	
-	// EXPERIMENTAL:
 	// Maximum amount of frames to resize (more frames means more processing power). "1" means no animated thumbnails.
-	// Requires $config['thumb_ext'] to be 'gif' $config['imagick'] to be enabled.
+	// Requires $config['thumb_ext'] to be 'gif' and $config['thumb_method'] to be 'imagick', 'convert', or 'convert+gifsicle'.
+	// Not respected by 'convert'; will just resize all frames if this is > 1.
 	$config['thumb_keep_animation_frames'] = 1;
 	
 	// Thumbnailing method:
@@ -431,8 +431,7 @@
 	//				PHP Imagick.
 	//	- 'convert+gifsicle'	Same as above, with the exception of using `gifsicle` (command line application)
 	//				instead of `convert` for resizing gifs. It's faster and resulting animated gifs
-	//				have less artifacts than if resized with ImageMagick. 
-                               
+	//				have less artifacts than if resized with ImageMagick.
 	$config['thumb_method'] = 'gd';
 	
 	// Strip EXIF metadata from JPEG files
@@ -939,6 +938,9 @@
 	// Automatically dismiss all reports regarding a thread when it is locked
 	$config['mod']['dismiss_reports_on_lock'] = true;
 	
+	// Replace ?/config with a simple text editor for editing inc/instance-config.php
+	$config['mod']['config_editor_php'] = false;
+	
 	// Probably best not to change these:
 	if (!defined('JANITOR')) {
 		define('JANITOR',	0,	true);
@@ -1009,7 +1011,7 @@
 	// Bypass flood check
 	$config['mod']['flood'] = ADMIN;
 	// Raw HTML posting
-	$config['mod']['rawhtml'] = MOD;
+	$config['mod']['rawhtml'] = ADMIN;
 	
 	/* Administration */
 	// View the report queue
@@ -1087,8 +1089,6 @@
 	// Delete news entries
 	$config['mod']['news_delete'] = ADMIN;
 	
-	// View the current configuration
-	$config['mod']['show_config'] = ADMIN;
 	// Edit the current configuration (via web interface)
 	$config['mod']['edit_config'] = ADMIN;