Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1735)
+++ branches/2.8.x/CHANGELOG	(revision 1736)
@@ -13,6 +13,8 @@
 
 
 
+31 Aug-2012 Build 1736 Dietmar Woellbrink (Luisehahne)
+! replace more invalid char in secureform.mtab to work with settings_page
 31 Aug-2012 Build 1735 Dietmar Woellbrink (Luisehahne)
 # fixed missing $admin-print_header() by security warning
 # fixed secureform.mtab because settings_page failed
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1735)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1736)
@@ -187,7 +187,7 @@
 	$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']);
 	$sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY));
 	$sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir);
-	$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED == 'true') ? '' : 'hide';
+	$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED) ? '' : 'hide';
 //	$oTpl->set_var('ICON_DIR', WB_REL.$sIconDir);
 	$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) );
 
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1735)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1736)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1735');
+if(!defined('REVISION')) define('REVISION', '1736');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/SecureForm.mtab.php
===================================================================
--- branches/2.8.x/wb/framework/SecureForm.mtab.php	(revision 1735)
+++ branches/2.8.x/wb/framework/SecureForm.mtab.php	(revision 1736)
@@ -301,7 +301,10 @@
 		$key = md5($this->_salt.rand().uniqid('', true));
 
 		//shorten hash a bit
-		$key = str_replace(array("=","$","+","/"),array("","","",""),base64_encode(pack('H*',$key)));
+		//$key = str_replace(array("=","$","+","/"),array("","","",""),base64_encode(pack('H*',$key)));
+        $regex = "/[$+= \/-]/"; // 20120831 dw
+        $replace = "";
+        $key = preg_replace ($regex, $replace, base64_encode(pack('H*',$key)), -1 );
 
 		// the key is unique, so store it in list
 		if( !array_key_exists($key,  $_SESSION[$this->_idkey_name])) {