From 4de6a321bcf9edb77f6dce5e91e7284a6bfb63c2 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Tue, 23 Oct 2012 07:02:36 +0000
Subject: [PATCH] issue 2524 if image upload and image delete request with same
 time, image replaced

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11842 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/menu.admin.controller.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 4b5443a22..f83176d6d 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -509,17 +509,17 @@
 			}
 
 			// Button delete check
-			if($args->isNormalDelete == 'Y')
+			if(!$btnOutput['normal_btn'] && $args->isNormalDelete == 'Y')
 			{
 				$item_info->normal_btn = '';
 			}
-			if($args->isHoverDelete == 'Y')
+			if(!$btnOutput['hover_btn'] && $args->isHoverDelete == 'Y')
 			{
 				$item_info->hover_btn = '';
 			}
-			if($args->isActiveDelete == 'Y')
+			if(!$btnOutput['active_btn'] && $args->isActiveDelete == 'Y')
 			{
-				$item_info->active_btn == '';
+				$item_info->active_btn = '';
 			}
 
 			$output = executeQuery('menu.updateMenuItem', $item_info);