From 5b063c10ad045d11d095a8b807108c92ce03e219 Mon Sep 17 00:00:00 2001
From: khongchi <sungbum00@gmail.com>
Date: Wed, 29 Jan 2014 15:12:10 +0900
Subject: [PATCH] =?UTF-8?q?#225=20temporary=20menu=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/menu/menu.admin.controller.php | 38 +++++---------------------
 modules/menu/menu.class.php            | 36 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index a804655af..c2d43ce78 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -120,32 +120,7 @@ class menuAdminController extends menu
 			$unlinked_menu_srl = $this->getUnlinkedMenu();
 			$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
 		}
-		
 
-/*		// for 1.7.4 update, 기존에 생성된 Temporary menu 항목 정리
-		$oMenuAdminModel = getAdminModel('menu');
-		$args = new stdClass();
-		$args->title = array("Temporary menu");
-		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
-		
-		$args = new stdClass();
-		if($temp_menus->toBool())
-		{
-			foreach($temp_menus->data as $menu)
-			{
-				$args->current_menu_srl = $menu->menu_srl;
-				$args->menu_srl = $moduleConfig->unlinked_menu_srl;
-				$output3 = executeQuery('menu.updateMenuItems', $args);
-					
-				if($output3->toBool())
-				{
-					// delete
-					$oMenuAdminController = getAdminController('menu');
-					$oMenuAdminController->deleteMenu($menu->menu_srl);
-				}
-			}
-		}
-*/
 	}
 	
 	function getUnlinkedMenu()
@@ -231,14 +206,15 @@ class menuAdminController extends menu
 	
 			$output = executeQuery('module.updateModule', $moduleInfo);
 			
-			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
-			{
-				$oCacheHandler->invalidateGroupKey('site_and_module');
-			}
 			return $output;
 		}
-	
+
+		$oCacheHandler = CacheHandler::getInstance('object', null, true);
+		if($oCacheHandler->isSupport())
+		{
+			$oCacheHandler->invalidateGroupKey('site_and_module');
+		}
+		
 		$oMenuAdminController = getAdminController('menu');
 		$oMenuAdminController->makeXmlFile($menuSrl);
 	
diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php
index 22fb0f5d2..f56e107c1 100644
--- a/modules/menu/menu.class.php
+++ b/modules/menu/menu.class.php
@@ -39,6 +39,15 @@ class menu extends ModuleObject
 		{
 			return TRUE;
 		}
+		
+		
+		$oMenuAdminModel = getAdminModel('menu');
+		$args = new stdClass();
+		$args->title = array("Temporary menu");
+		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
+		if($temp_menus->toBool() && count($temp_menus->data)) return true;
+		
+		
 		return false;
 	}
 
@@ -135,6 +144,33 @@ class menu extends ModuleObject
 
 			$this->recompileCache();
 		}
+		
+		// for 1.7.4 update, 기존에 생성된 Temporary menu 항목 정리
+		$oMenuAdminModel = getAdminModel('menu');
+		$args = new stdClass();
+		$args->title = array("Temporary menu");
+		$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
+		
+		$args = new stdClass();
+		if($temp_menus->toBool() && count($temp_menus->data))
+		{
+			
+			$oMenuAdminController = getAdminController('menu');
+			foreach($temp_menus->data as $menu)
+			{
+				$args->current_menu_srl = $menu->menu_srl;
+				$args->menu_srl = $oMenuAdminController->getUnlinkedMenu();
+				$output3 = executeQuery('menu.updateMenuItems', $args);
+					
+				if($output3->toBool())
+				{
+					// delete
+					$oMenuAdminController->deleteMenu($menu->menu_srl);
+				}
+			}
+			
+			$this->recompileCache();
+		}
 
 		return new Object(0, 'success_updated');
 	}