Merge with older github view

2 files changed, 6 insertions, 4 deletions

diff --git a/Nexus.php b/Nexus.php
index ff283be..843b857 100644
--- a/Nexus.php
+++ b/Nexus.php
@@ -236,6 +236,7 @@ class Nexus extends NexusSystem {
 	function storeMenu( &$pParamHash ) {
 		$ret = FALSE;
 		if( $this->verifyMenu( $pParamHash ) ) {
+			$this->mDb->StartTrans();
 			if( !@BitBase::verifyId( $pParamHash['menu_id'] ) ) {
 				$query = "INSERT INTO `".BIT_DB_PREFIX."nexus_menus`( `title`,`description`,`menu_type`,`plugin_guid`,`editable` ) VALUES(?,?,?,?,?)";
 				$result = $this->mDb->query( $query, array( $pParamHash['title'], $pParamHash['description'], $pParamHash['menu_type'], $pParamHash['plugin_guid'], $pParamHash['editable'] ) );
@@ -246,6 +247,7 @@ class Nexus extends NexusSystem {
 				$result = $this->mDb->query( $query, array( $pParamHash['title'], $pParamHash['description'], $pParamHash['menu_type'], $pParamHash['plugin_guid'], $pParamHash['editable'], $pParamHash['menu_id'] ) );
 				$ret = $pParamHash['menu_id'];
 			}
+			$this->mDb->CompleteTrans();
 			$this->writeMenuCache( $ret );
 		} else {
 			error_log( "Error storing menu: " . vc($this->mErrors) );
@@ -295,7 +297,7 @@ class Nexus extends NexusSystem {
 			$bindVars = array( $pMenuId );
 		}
 		$query .= ' ORDER BY nmi.`pos`';
-		$result = $this->mDb->query( $query, array( $bindVars ) );
+		$result = $this->mDb->query( $query, $bindVars );
 		while( !$result->EOF ) {
 			$item = $result->fields;
 			$item['display_url'] = $this->printUrl( $item );
diff --git a/menu_items.php b/menu_items.php
index ffac5a1..c912490 100644
--- a/menu_items.php
+++ b/menu_items.php
@@ -16,7 +16,7 @@ include_once( NEXUS_PKG_PATH.'menu_lookup_inc.php' );
 $gBitSystem->verifyPermission( 'p_nexus_create_menus' );
 
 if( empty( $_REQUEST['menu_id'] ) ) {
-	header( 'Location:'.NEXUS_PKG_URL.'index.php' );
+	bit_redirect( NEXUS_PKG_URL.'index.php' );
 }
 
 // get content and pass it on
@@ -37,7 +37,7 @@ if( isset( $_REQUEST['store_item'] ) ) {
 	} else {
 		$formfeedback['error'] = $gNexus->mErrors;
 	}
-	$gNexus->load();
+	bit_redirect( NEXUS_PKG_URL.'menu_items.php?menu_id='.$_REQUEST['menu_id'] );
 }
 
 if( isset( $_REQUEST['remove_item'] ) && is_array( $_REQUEST['remove_item'] ) ) {
@@ -52,8 +52,8 @@ if( isset( $_REQUEST['remove_item'] ) && is_array( $_REQUEST['remove_item'] ) )
 		$formfeedback['success'] = tra( 'The following items were successfully removed from the menu' ).': ';
 		$gBitSmarty->assign( 'delList', $delList );
 	}
-	$gNexus->load();
 	$gNexus->writeMenuCache();
+	bit_redirect( NEXUS_PKG_URL.'menu_items.php?menu_id='.$_REQUEST['menu_id'] );
 }
 
 if( !empty( $_REQUEST['item_id'] ) ) {