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

inc/config.php

@@ -40,19 +40,6 @@
 	define('THREADS_PREVIEW',	5, true);
 
 	// Error messages
-<<<<<<< HEAD
-	define('ERROR_LURK',	'Lurk some more before posting.');
-	define('ERROR_BOT',		'You look like a bot.');
-	define('ERROR_TOOLONG',	'The %s field was too long.');
-	define('ERROR_TOOLONGBODY', 'The body was too long.');
-	define('ERROR_TOOSHORTBODY', 'The body was too short or empty.');
-	define('ERROR_NOIMAGE',	'You must upload an image.');
-	define('ERROR_NOMOVE',	'The server failed to handle your upload.');
-	define('ERROR_FILEEXT',	'Unsupported image format.');
-	define('ERR_INVALIDIMG','Invalid image.');
-	define('ERR_FILESIZE', 'Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes');
-	define('ERR_MAXSIZE', 'The file was too big.');
-=======
 	define('ERROR_LURK',	'Lurk some more before posting.', true);
 	define('ERROR_BOT',		'You look like a bot.', true);
 	define('ERROR_TOOLONG',	'The %s field was too long.', true);
@@ -64,7 +51,6 @@
 	define('ERR_INVALIDIMG','Invalid image.', true);
 	define('ERR_FILESIZE', 'Maximum file size: %maxsz% bytes<br>Your file\'s size: %filesz% bytes', true);
 	define('ERR_MAXSIZE', 'The file was too big.', true);
->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89
 
 	// For resizing, max values
 	define('THUMB_WIDTH',	200, true);
@@ -80,10 +66,6 @@
 	define('ZIP_IMAGE',		'src/zip.png', true);
 
 
-	define('ALLOW_ZIP',		true);
-	define('ZIP_IMAGE',		'src/zip.png');
-	
-	
 	/**
 		Redraw the image using GD functions to strip any excess data (commonly ZIP archives)
 		WARNING: Very beta. Currently strips animated GIFs too :(
@@ -94,11 +76,7 @@
 	define('REDRAW_GIF',	false, true);
 
 	// Display the aspect ratio in a post's file info
-<<<<<<< HEAD
-	define('SHOW_RATIO',	true);
-=======
 	define('SHOW_RATIO',	true, true);
->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89
 
 	define('DIR_IMG',		'src/', true);
 	define('DIR_THUMB',		'thumb/', true);
@@ -128,14 +106,8 @@
 	define('URL_MATCH',		'/^' . (@$_SERVER['HTTPS']?'https':'http').':\/\/'.$_SERVER['HTTP_HOST'] . '(' . preg_quote(ROOT, '/') . '|' . preg_quote(ROOT, '/') . '' . preg_quote(FILE_INDEX, '/') . '|' . preg_quote(ROOT, '/') . '' . str_replace('%d', '\d+', preg_quote(FILE_PAGE, '/')) . ')$/', true);
 
 	if(!defined('IS_INSTALLATION')) {
-<<<<<<< HEAD
-		if(!file_exists(DIR_IMG)) @mkdir(DIR_IMG) or error("Couldn't create " . DIR_IMG . ". Install manually.");
-		if(!file_exists(DIR_THUMB)) @mkdir(DIR_THUMB) or error("Couldn't create " . DIR_IMG . ". Install manually.");
-		if(!file_exists(DIR_RES)) @mkdir(DIR_RES) or error("Couldn't create " . DIR_IMG . ". Install manually.");
-=======
 		if(!file_exists(DIR_IMG)) @mkdir(DIR_IMG) or error("Couldn't create " . DIR_IMG . ". Install manually.", true);
 		if(!file_exists(DIR_THUMB)) @mkdir(DIR_THUMB) or error("Couldn't create " . DIR_IMG . ". Install manually.", true);
 		if(!file_exists(DIR_RES)) @mkdir(DIR_RES) or error("Couldn't create " . DIR_IMG . ". Install manually.", true);
->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89
 	}
 ?>

post.php

@@ -81,11 +81,8 @@
 			$size = $_FILES['file']['size'];
 			if($size > MAX_FILESIZE)
 				error(sprintf3(ERR_FILESIZE, array(
-<<<<<<< HEAD
 					'sz'=>commaize($size),
-=======
 					'filesz'=>commaize($size),
->>>>>>> 6cdaed486e6c373b52f639d3e92d7365242f6a89
 					'maxsz'=>commaize(MAX_FILESIZE))));
 		}