merge recent changes into HEAD

3 files changed, 9 insertions, 9 deletions

diff --git a/Nexus.php b/Nexus.php
index f9bb887..5a975b9 100644
--- a/Nexus.php
+++ b/Nexus.php
@@ -4,7 +4,7 @@
 *
 * @abstract
 * @author   xing <xing@synapse.plus.com>
-* @version  $Revision: 1.8 $
+* @version  $Revision: 1.9 $
 * @package  nexus
 */
 
@@ -585,7 +585,7 @@ class Nexus extends NexusSystem {
 				$this->mDb->query( $query, array( (int)$res["pos"], (int)$item["item_id"] ) );
 			}
 			$this->mDb->CompleteTrans();
-			$this->mDb->writeModuleCache( $item['menu_id'] );
+			$this->writeModuleCache( $item['menu_id'] );
 		}
 	}
 
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index e28824a..f489e6a 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -48,7 +48,7 @@ $gBitInstaller->registerPackageInfo( NEXUS_PKG_NAME, array(
 
 // ### Default UserPermissions
 $gBitInstaller->registerUserPermissions( NEXUS_PKG_NAME, array(
-	array('bit_p_insert_nexus_item', 'Can insert menu item in a menu while editing a page', 'editors', NEXUS_PKG_NAME),
+	array('bit_p_insert_nexus_item', 'Can insert menu item in a menu while editing a page', 'registered', NEXUS_PKG_NAME),
 	array('bit_p_create_nexus_menus', 'Can create new menus using Nexus', 'editors', NEXUS_PKG_NAME),
 ) );
 
diff --git a/templates/menu_items_edit_inc.tpl b/templates/menu_items_edit_inc.tpl
index 4937693..c57950a 100644
--- a/templates/menu_items_edit_inc.tpl
+++ b/templates/menu_items_edit_inc.tpl
@@ -13,17 +13,17 @@
 		{/forminput}
 
 		{forminput}
+			<input type="text" name="find_objects" value="{$smarty.request.find_objects}" /> 
+			<input type="submit" value="{tr}filter{/tr}" name="search_objects" />
+			{formhelp note=""}
+		{/forminput}
+
+		{forminput}
 			{html_options name="content" options=$contentList onchange="document.getElementById('rsrc').value=options[selectedIndex].value;document.getElementById('title').value=options[selectedIndex].label.replace(/ \[id.*?\]/,'');document.getElementById('rsrc_type').value='content_id';"}
 			<noscript>
 				{formhelp note="Since you don't have javascript (enabled), please insert the appropriate information from the dropdown manually. The content ID is the number associated with the item in the dropdown list."}
 			</noscript>
 		{/forminput}
-
-		{forminput}
-			<input type="text" name="find_objects" value="{$smarty.request.find_objects}" /> 
-			<input type="submit" value="{tr}filter{/tr}" name="search_objects" />
-			{formhelp note=""}
-		{/forminput}
 	</div>
 
 	{if $menuList}