From 1a34557da777fb65d053311d4a59b53045dcf851 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 19 Mar 2012 11:07:13 +0000
Subject: [PATCH] if image replacement is unwanted, don't allow users to
 replace images

---
 ext/image/main.php  | 2 +-
 ext/upload/main.php | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/ext/image/main.php b/ext/image/main.php
index a82c7b78..d991a674 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -201,7 +201,7 @@ class ImageIO extends Extension {
 			$event->add_part($this->theme->get_deleter_html($event->image->id));
 		}
 		/* In the future, could perhaps allow users to replace images that they own as well... */
-		if ($user->can("replace_image") && $config->get_bool("upload_replace")) {
+		if ($user->can("replace_image")) {
 			$event->add_part($this->theme->get_replace_html($event->image->id));
 		}
 	}
diff --git a/ext/upload/main.php b/ext/upload/main.php
index 791795b0..0d863186 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -51,7 +51,6 @@ class Upload extends Extension {
 		$config->set_default_int('upload_count', 3);
 		$config->set_default_int('upload_size', '1MB');
 		$config->set_default_bool('upload_anon', false);
-		$config->set_default_bool('upload_replace', true);
 
 		// SHIT: fucking PHP "security" measures -_-;;;
 		$free_num = @disk_free_space(realpath("./images/"));
@@ -95,7 +94,6 @@ class Upload extends Extension {
 		$sb->add_shorthand_int_option("upload_size", "<br/>Max size per file: ");
 		$sb->add_label("<i>PHP Limit = ".ini_get('upload_max_filesize')."</i>");
 		$sb->add_bool_option("upload_anon", "<br/>Allow anonymous uploads: ");
-		$sb->add_bool_option("upload_replace", "<br/>Allow replacing images: ");
 		$sb->add_choice_option("transload_engine", $tes, "<br/>Transload: ");
 		$event->panel->add_block($sb);
 	}
@@ -116,11 +114,6 @@ class Upload extends Extension {
 		global $config, $page, $user;
 
 		if($event->page_matches("upload/replace")) {
-			/* Upload & Replace Image Request */
-			if(!$config->get_bool("upload_replace")) {
-				throw new UploadException("Upload Replacing Images is not enabled.");
-			}
-			
 			// check if the user is an administrator and can upload files.
 			if(!$user->can("replace_image")) {
 				$this->theme->display_permission_denied();