From 300e241ed8c04eefa112ba44734935c5b840e91f Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Tue, 27 Nov 2012 05:31:42 +0000
Subject: [PATCH] add browser title

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

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 78bcdcaa3..de28fa272 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -507,6 +507,10 @@ class menuAdminController extends menu
 			}
 
 			$moduleInfo->mid = $request->module_id;
+			if($request->browser_title)
+			{
+				$moduleInfo->browser_title = $request->browser_title;
+			}
 			$oModuleController = &getController('module');
 			$oModuleController->updateModule($moduleInfo);
 			$args->url = $request->module_id;
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 721d80884..4f570a08e 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -481,6 +481,7 @@ class menuAdminModel extends menu
 						$menuItems->title = $value->title;
 						$menuItems->menuItems = $menu;
 
+						// If include home menu, move first
 						if($value->menu_srl == $this->menuSrlWithinHome)
 						{
 							$menuList[-1] = $menuItems;
@@ -555,7 +556,8 @@ class menuAdminModel extends menu
 		}
 
 		//if menu type is module menu
-		if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
+		//if(!empty($menu['url']) && !preg_match('/^http/i', $menu['url']))
+		if($menu['is_shortcut'] != 'Y')
 		{
 			unset($midInfo);
 			unset($moduleInfo);
@@ -582,6 +584,7 @@ class menuAdminModel extends menu
 			}
 			// setting layout srl for layout management
 			$menu['layout_srl'] = $midInfo->layout_srl;
+			$menu['browser_title'] = $midInfo->browser_title;
 		}
 		if(count($menu['list']) > 0)
 		{