From ceac2bdb704c1fd780d4d57dd5d9bc007e5e6d95 Mon Sep 17 00:00:00 2001
From: Max Kremmel <xing@synapse.plus.com>
Date: Tue, 5 Sep 2006 08:54:57 +0000
Subject: make delete process more specific that other package can make better
 use of it.

---
 edit_structure_inc.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'edit_structure_inc.php')

diff --git a/edit_structure_inc.php b/edit_structure_inc.php
index 5f58e36..7429030 100644
--- a/edit_structure_inc.php
+++ b/edit_structure_inc.php
@@ -3,7 +3,7 @@
  * edit_structure_inc
  *
  * @author   Christian Fowler>
- * @version  $Revision: 1.13 $
+ * @version  $Revision: 1.14 $
  * @package  liberty
  * @subpackage functions
  */
@@ -68,9 +68,8 @@ if( !@BitBase::verifyId( $_REQUEST["structure_id"] ) ) {
 		}
 	}
 
-	if( ( isset( $_REQUEST["action"] ) && ( $_REQUEST["action"] == 'remove' ) ) || isset( $_REQUEST["confirm"] ) ) {
-
-		if( isset( $_REQUEST["confirm"] ) ) {
+	if( ( isset( $_REQUEST["action"] ) && ( $_REQUEST["action"] == 'remove' ) ) || !empty( $_REQUEST["confirm"] ) ) {
+		if( $_REQUEST["action"] == 'remove' && !empty( $_REQUEST["confirm"] ) ) {
 			if( $gStructure->s_remove_page( $_REQUEST["structure_id"], false ) ) {
 				header( "Location: ".$_SERVER['PHP_SELF'].'?structure_id='.$gStructure->mInfo["parent_id"] );
 				die;
@@ -78,7 +77,9 @@ if( !@BitBase::verifyId( $_REQUEST["structure_id"] ) ) {
 				vd( $gStructure->mErrors );
 			}
 		}
+
 		$gBitSystem->setBrowserTitle( 'Confirm removal of '.$gContent->getTitle() );
+		$formHash['action'] = 'remove';
 		$formHash['remove'] = TRUE;
 		$formHash['structure_id'] = $_REQUEST['structure_id'];
 		$msgHash = array(
-- 
cgit v1.3