From 2d451224dd4cab62b87b9c77af7ba97371d97fc4 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Tue, 22 May 2012 12:14:46 +0100
Subject: [PATCH] only one of tags/image-specific-tags needs filling

---
 ext/upload/main.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/upload/main.php b/ext/upload/main.php
index f88db765..06723691 100644
--- a/ext/upload/main.php
+++ b/ext/upload/main.php
@@ -215,7 +215,9 @@ class Upload extends Extension {
 
 	private function tags_for_upload_slot($id) {
 		if(isset($_POST["tags$id"])) {
-			$tags = array_merge(Tag::explode($_POST['tags']), Tag::explode($_POST["tags$id"]));
+			# merge then explode, not explode then merge - else
+			# one of the merges may create a surplus "tagme"
+			$tags = Tag::explode($_POST['tags'] . " " . $_POST["tags$id"]);
 		}
 		else {
 			$tags = Tag::explode($_POST['tags']);