From 8b62ad281a4af3a935c64f61647fe06cfe1413ce Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 5 Mar 2012 09:31:32 +0000
Subject: [PATCH] if upload_collision_handler is set to 'don't merge tags',
 then don't merge tags

---
 ext/image/main.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ext/image/main.php b/ext/image/main.php
index 6db78525..4b306ab6 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -301,14 +301,12 @@ class ImageIO extends Extension {
 		$existing = Image::by_hash($image->hash);
 		if(!is_null($existing)) {
 			$handler = $config->get_string("upload_collision_handler");
-			if($handler == "merge") {
+			if($handler == "merge" || isset($_GET['update'])) {
 				$merged = array_merge($image->get_tag_array(), $existing->get_tag_array());
 				send_event(new TagSetEvent($existing, $merged));
 				return null;
 			}
 			else {
-				$merged = array_merge($image->get_tag_array(), $existing->get_tag_array()); //TODO: Make this only work if &update=1 is set
-				send_event(new TagSetEvent($existing, $merged)); //Update tags even if image exists
 				$error = "Image <a href='".make_link("post/view/{$existing->id}")."'>{$existing->id}</a> ".
 						"already has hash {$image->hash}:<p>".Themelet::build_thumb_html($existing);
 				throw new ImageAdditionException($error);