From de09735e6953ad39e38baebc12e6d6b8eb8c1681 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Fri, 11 Apr 2008 05:17:51 +0000
Subject: [PATCH] neatness

git-svn-id: file:///home/shish/svn/shimmie2/trunk@800 7f39781d-f577-437e-ae19-be835c7a54ca
---
 ext/image/main.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/image/main.php b/ext/image/main.php
index db3423da..23977e94 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -100,7 +100,8 @@ class ImageIO extends Extension {
 		if(!is_null($existing)) {
 			$handler = $config->get_string("upload_collision_handler");
 			if($handler == "merge") {
-				send_event(new TagSetEvent($existing->id, array_merge($image->get_tag_array(), $existing->get_tag_array())));
+				$merged = array_merge($image->get_tag_array(), $existing->get_tag_array());
+				send_event(new TagSetEvent($existing->id, $merged));
 				return null;
 			}
 			else {