james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

neatness

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/trunk@800 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2008-04-11 05:17:51 +00:00
parent 7a6ccf11de
commit de09735e69
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/image/main.php
View File

@ -100,7 +100,8 @@ class ImageIO extends Extension {
if(!is_null($existing)) { if(!is_null($existing)) {
$handler = $config->get_string("upload_collision_handler"); $handler = $config->get_string("upload_collision_handler");
if($handler == "merge") { 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; return null;
} }
else { else {