Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1893)
+++ branches/2.8.x/CHANGELOG	(revision 1894)
@@ -13,8 +13,13 @@
 
 
 
+19 Mar-2013 Build 1894 Dietmar Woellbrink (Luisehahne)
+# bugfix form intall form284db.sql
+# bugfix wb_search_data.sql layout for table settings 
+! update menu_link module and set Version to 2.8.1
 19 Mar-2013 Build 1893 Dietmar Woellbrink (Luisehahne)
-
+# little issue on handing the cache in TranslationTable
+# fix missing block or block[0] issue in /admin/pages/section.php
 19 Mar-2013 Build 1892 Dietmar Woellbrink (Luisehahne)
 ! update output_filter module set version to 0.4.1 
 19 Mar-2013 Build 1891 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1893)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1894)
@@ -369,7 +369,7 @@
  */
 	$aMissingTables = UpgradeHelper::existsAllTables($aPackage);
 	if( sizeof($aMissingTables) == 0){
-        echo '<h4 style="margin-left:0;">NOTICE: '.sizeof($aPackage).' total tables included in package are successful installed your database `'.$database->DbName.'` '.$OK.'</h4>';
+        echo '<h4 style="margin-left:0;">NOTICE: '.sizeof($aPackage).' total tables included in package are successfully installed into your database `'.$database->DbName.'` '.$OK.'</h4>';
     } else {
         status_msg('<strong>:</strong><br />can\'t run Upgrade, missing tables', 'warning', 'div');
         echo '<h4>Missing required tables. You can install them in backend->addons->modules.<br />';
@@ -397,133 +397,138 @@
         </body>
         </html>";
 
-        exit();
-    }
+		exit();
+	}
 
 echo '<h3>Step '.(++$stepID).': Setting default_theme</h3>';
 $aDebugMessage = array();
-    /**********************************************************
-     *  - Adding field default_theme to settings table
-     */
-    $aDebugMessage[] = '<div style="margin-left:2em;">';
-    $aDebugMessage[] = "<br /><span><strong>Adding default_theme to settings table</strong></span>";
-    // db_update_key_value('settings', 'default_theme', $DEFAULT_THEME);
-    $cfg = array(
-    	'default_theme' => defined('DEFAULT_THEME')&& (DEFAULT_THEME!='') ? DEFAULT_THEME : $DEFAULT_THEME
-    );
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
-    $aDebugMessage[] = '</div>';
+	/**********************************************************
+	 *  - Adding field default_theme to settings table
+	 */
+	$aDebugMessage[] = '<div style="margin-left:2em;">';
+	$aDebugMessage[] = "<br /><span><strong>Adding default_theme to settings table</strong></span>";
+	// db_update_key_value('settings', 'default_theme', $DEFAULT_THEME);
+	$cfg = array(
+		'default_theme' => defined('DEFAULT_THEME')&& (DEFAULT_THEME!='') ? DEFAULT_THEME : $DEFAULT_THEME
+	);
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = '</div>';
 
 if($bDebugModus) {
-    echo implode(PHP_EOL,$aDebugMessage);
+	echo implode(PHP_EOL,$aDebugMessage);
 }
 $aDebugMessage = array();
 echo'<h3>Step '.(++$stepID).': Updating core table included in package</h3>';
-    /**********************************************************
-     *  - Adding field sec_anchor to settings table
-     */
-    echo '<div style="margin-left:2em;">';
-    echo "<h4>Adding/updating entries on table settings</h4>";
-    $aDebugMessage[] = "<span>Adding/updating sec_anchor to settings table</span>";
-    $cfg = array(
-    	'sec_anchor' => defined('SEC_ANCHOR')&& (SEC_ANCHOR!='') ? SEC_ANCHOR : 'section_'
-    );
-   $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	/**********************************************************
+	 *  - Adding field sec_anchor to settings table
+	 */
+	echo '<div style="margin-left:2em;">';
+	echo "<h4>Adding/updating entries on table settings</h4>";
+	$aDebugMessage[] = "<span>Adding/updating sec_anchor to settings table</span>";
+	$cfg = array(
+		'sec_anchor' => defined('SEC_ANCHOR')&& (SEC_ANCHOR!='') ? SEC_ANCHOR : 'section_'
+	);
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding redirect timer to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating redirect timer to settings table</span>";
-    $cfg = array(
-    	'redirect_timer' => defined('REDIRECT_TIMER')&& (REDIRECT_TIMER!='') ? REDIRECT_TIMER : '1500'
-    );
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	/**********************************************************
+	 *  - Adding redirect timer to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating redirect timer to settings table</span>";
+	$cfg = array(
+		'redirect_timer' => defined('REDIRECT_TIMER')&& (REDIRECT_TIMER!='') ? REDIRECT_TIMER : '1500'
+	);
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding default_time_formatr to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating default_time_format to settings table</span>";
-    $cfg = array(
-    	'default_time_format' => defined('DEFAULT_TIME_FORMAT')&& (DEFAULT_TIME_FORMAT!='') ? DEFAULT_TIME_FORMAT : 'h:i A'
-    );
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	/**********************************************************
+	 *  - Adding default_time_formatr to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating default_time_format to settings table</span>";
+	$cfg = array(
+		'default_time_format' => defined('DEFAULT_TIME_FORMAT')&& (DEFAULT_TIME_FORMAT!='') ? DEFAULT_TIME_FORMAT : 'h:i A'
+	);
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding rename_files_on_upload to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/Updating rename_files_on_upload to settings table</span>";
-    $cfg = array(
-        'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD')&& (RENAME_FILES_ON_UPLOAD!='') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js')
-    );
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	/**********************************************************
+	 *  - Adding rename_files_on_upload to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/Updating rename_files_on_upload to settings table</span>";
+	$cfg = array(
+	    'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD')&& (RENAME_FILES_ON_UPLOAD!='') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js')
+	);
+	if( version_compare( WB_VERSION, '2.8.2', '<' )) {
+		$cfg = array(
+		    'rename_files_on_upload' => 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js'
+		);
+	}
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding mediasettings to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating mediasettings to settings table</span>";
-    $cfg = array(
-    	'mediasettings' => (defined('MEDIASETTINGS')&& (MEDIASETTINGS!='') ? MEDIASETTINGS : ''),
-    );
+	/**********************************************************
+	 *  - Adding mediasettings to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating mediasettings to settings table</span>";
+	$cfg = array(
+		'mediasettings' => (defined('MEDIASETTINGS')&& (MEDIASETTINGS!='') ? MEDIASETTINGS : ''),
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding fingerprint_with_ip_octets to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating fingerprint_with_ip_octets to settings table</span>";
-    $cfg = array(
-    	'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'),
-    	'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '')
-    );
+	/**********************************************************
+	 *  - Adding fingerprint_with_ip_octets to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating fingerprint_with_ip_octets to settings table</span>";
+	$cfg = array(
+		'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'),
+		'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '')
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding page_icon_dir to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating page_icon_dir to settings table</span>";
-    $cfg = array(
-    	'page_icon_dir' => (defined('PAGE_ICON_DIR')&& (PAGE_ICON_DIR!='') ? PAGE_ICON_DIR : '/templates/*/title_images'),
-    );
+	/**********************************************************
+	 *  - Adding page_icon_dir to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating page_icon_dir to settings table</span>";
+	$cfg = array(
+		'page_icon_dir' => (defined('PAGE_ICON_DIR')&& (PAGE_ICON_DIR!='') ? PAGE_ICON_DIR : '/templates/*/title_images'),
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
-    /**********************************************************
-     *  - Adding page_extended to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating page_extendet to settings table</span>";
-    $cfg = array(
-    	'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'),
-    );
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	/**********************************************************
+	 *  - Adding page_extended to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating page_extendet to settings table</span>";
+	$cfg = array(
+		'page_extendet' => (defined('PAGE_EXTENDET') ? PAGE_EXTENDET : 'true'),
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding wbmail_signature to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating wbmail_signature to settings table</span>";
-    $cfg = array(
-    	'wbmail_signature' => (defined('WBMAIL_SIGNATURE')&& (WBMAIL_SIGNATURE!='') ? WBMAIL_SIGNATURE : '')
-    );
+	/**********************************************************
+	 *  - Adding wbmail_signature to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating wbmail_signature to settings table</span>";
+	$cfg = array(
+		'wbmail_signature' => (defined('WBMAIL_SIGNATURE')&& (WBMAIL_SIGNATURE!='') ? WBMAIL_SIGNATURE : '')
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding confirmed_registration to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating confirmed_registration to settings table</span>";
-    $cfg = array(
-    	'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0')
-    );
+	/**********************************************************
+	 *  - Adding confirmed_registration to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating confirmed_registration to settings table</span>";
+	$cfg = array(
+		'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') ? CONFIRMED_REGISTRATION : '0')
+	);
 
-    $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+	$aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
-    /**********************************************************
-     *  - Adding dev_infos to settings table
-     */
-    $aDebugMessage[] = "<span>Adding/updating dev_infos to settings table</span>";
-    $cfg = array(
-    	'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false')
-    );
+	/**********************************************************
+	 *  - Adding dev_infos to settings table
+	 */
+	$aDebugMessage[] = "<span>Adding/updating dev_infos to settings table</span>";
+	$cfg = array(
+		'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false')
+	);
 
     $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
 
@@ -535,7 +540,7 @@
 $aDebugMessage = array();
 if(version_compare(WB_REVISION, REVISION, '<='))
 {
-    echo '<div style="margin-left:2em;">';
+	echo '<div style="margin-left:2em;">';
 	/**********************************************************
 	 *  - Update search no results database filed to create
 	 *  valid XHTML if search is empty
@@ -542,32 +547,18 @@
 	 */
 	if (version_compare(WB_VERSION, '2.8', '<'))
 	{
-        echo "<h4>Adding/updating fields on table search</h4>";
-	    echo "Updating database field `no_results` on search table: ";
-	    $search_no_results = addslashes('<tr><td><p>[TEXT_NO_RESULTS]</p></td></tr>');
-	    $sql  = 'UPDATE `'.TABLE_PREFIX.'search` ';
+		echo "<h4>Adding/updating fields on table search</h4>";
+		echo "Updating database field `no_results` on search table: ";
+		$search_no_results = addslashes('<tr><td><p>[TEXT_NO_RESULTS]</p></td></tr>');
+		$sql  = 'UPDATE `'.TABLE_PREFIX.'search` ';
 		$sql .= 'SET `value`=\''.$search_no_results.'\' ';
 		$sql .= 'WHERE `name`=\'no_results\'';
-	    echo ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";
+		echo ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";
 	}
 
-	echo "<h4>Adding/updating field on table mod_menu_link</h4>";
+	$aDebugMessage = array();
+	echo "<h4>Adding/updating field on table pages</h4>";
 	/**********************************************************
-     *  - Add field "redirect_type" to table "mod_menu_link"
-     *  has to be moved later to upgrade.php in modul menu_link, because modul can be removed
-     */
-	$table_name = TABLE_PREFIX.'mod_menu_link';
-	$field_name = 'redirect_type';
-	$description = "INT NOT NULL DEFAULT '301' AFTER `target_page_id`";
-	add_modify_field_in_database($table_name,$field_name,$description);
-
-    if($bDebugModus) {
-        echo implode(PHP_EOL,$aDebugMessage);
-    }
-
-    $aDebugMessage = array();
-    echo "<h4>Adding/updating field on table pages</h4>";
-	/**********************************************************
 	 *  - Add field "page_trail" to table "pages"
 	 */
 	$table_name = TABLE_PREFIX.'pages';
@@ -576,12 +567,12 @@
 	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
-     *  - Add field "page_icon" to table "pages"
-     */
+	 *  - Add field "page_icon" to table "pages"
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'page_icon';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `page_title`";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "page_code" to table "pages"
@@ -589,39 +580,39 @@
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'page_code';
 	$description = "INT NOT NULL DEFAULT '0' AFTER `language`";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
-     *  - Add field "menu_icon_0" to table "pages"
-     */
+	 *  - Add field "menu_icon_0" to table "pages"
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'menu_icon_0';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_title`";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "menu_icon_1" to table "pages"
-     */
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'menu_icon_1';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_icon_0`";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "tooltip" to table "pages"
-     */
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'tooltip';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_icon_1`";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "admin_groups" to table "pages"
-     */
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'admin_groups';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '1'";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "admin_users" to table "pages"
@@ -629,7 +620,7 @@
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'admin_users';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT ''";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "viewing_groups" to table "pages"
@@ -637,9 +628,7 @@
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'viewing_groups';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT '1'";
-//	echo "<span>Modify field viewing_groups to pages table</span>";
-//	echo ($database->field_modify($table_name, $field_name, $description) ? " $OK<br />" : " $FAIL!<br />");
-    add_modify_field_in_database($table_name,$field_name,$description);
+	 add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
 	 *  - Add field "viewing_users" to table "pages"
@@ -647,33 +636,33 @@
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'viewing_users';
 	$description = "VARCHAR( 512 ) NOT NULL DEFAULT ''";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
-     *  - Add field "custom01" to table "pages"
-     */
+	 *  - Add field "custom01" to table "pages"
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'custom01';
 	$description = "VARCHAR( 255 ) NOT NULL DEFAULT '' ";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	/**********************************************************
-     *  - Add field "custom02" to table "pages"
-     */
+	 *  - Add field "custom02" to table "pages"
+	 */
 	$table_name = TABLE_PREFIX.'pages';
 	$field_name = 'custom02';
 	$description = "VARCHAR( 255 ) NOT NULL DEFAULT '' ";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
-    if($bDebugModus) {
-        echo implode(PHP_EOL,$aDebugMessage);
-    }
+	if($bDebugModus) {
+		echo implode(PHP_EOL,$aDebugMessage);
+	}
 
 	$aDebugMessage = array();
 	/**********************************************************
-     * modify wrong strucre on table sections
-     * wrong structure let crash wb
-     */
+	 * modify wrong strucre on table sections
+	 * wrong structure let crash wb
+	 */
 	echo "<h4>Change field structure on table sections</h4>";
 	$table_name = TABLE_PREFIX.'sections';
 	$description = "VARCHAR( 255 ) NOT NULL DEFAULT ''";
@@ -688,16 +677,16 @@
 	$aDebugMessage[] = "<span>Modify field publ_end on sections table</span>";
 	$aDebugMessage[] = ($database->field_modify($table_name, 'publ_end', $description) ? " $OK<br />" : " $FAIL!<br />");
 
-    if($bDebugModus) {
-        echo implode(PHP_EOL,$aDebugMessage);
-    }
-    echo '</div>';
+	if($bDebugModus) {
+		echo implode(PHP_EOL,$aDebugMessage);
+	}
+	echo '</div>';
 }
 
 if(version_compare(WB_REVISION, REVISION, '<='))
 {
-    $aDebugMessage = array();
-    echo '<h3>Step '.(++$stepID).': Updating structure in table users/groups</h3>';
+	$aDebugMessage = array();
+	echo '<h3>Step '.(++$stepID).': Updating structure in table users/groups</h3>';
 	/**********************************************************
 	 * Modify Administrator on groups table
 	 */
@@ -717,46 +706,44 @@
 	$sql .= '`module_permissions` = \''.$sModulePermissions.'\', ';
 	$sql .= '`template_permissions` = \''.$sTemplatePermissions.'\' ';
 	$sql .= 'WHERE `group_id` = \'1\' ';
-    $aDebugMessage[] = ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";
-    if( ($admin->is_authenticated() == true) && ($admin->ami_group_member('1') ) ) {
-        $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $sSystemPermissions));
-    }
+	$aDebugMessage[] = ($database->query($sql)) ? " $OK<br />" : " $FAIL!<br />";
+	if( ($admin->is_authenticated() == true) && ($admin->ami_group_member('1') ) ) {
+	    $_SESSION['SYSTEM_PERMISSIONS'] = array_merge($_SESSION['SYSTEM_PERMISSIONS'], explode(',', $sSystemPermissions));
+	}
 
-    if($bDebugModus) {
-        echo implode(PHP_EOL,$aDebugMessage);
-    }
-    echo '</div>';
-    $aDebugMessage = array();
-    /**********************************************************
+	if($bDebugModus) {
+		echo implode(PHP_EOL,$aDebugMessage);
+	}
+	echo '</div>';
 	$aDebugMessage = array();
 	/**********************************************************
- *   `confirm_code` VARCHAR(32) NOT NULL DEFAULT '',
- *   `confirm_timeout` INT(11) NOT NULL DEFAULT '0',
- */
+	 *   `confirm_code` VARCHAR(32) NOT NULL DEFAULT '',
+	 *   `confirm_timeout` INT(11) NOT NULL DEFAULT '0',
+	 */
 	echo '<div style="margin-left:2em;">';
 	echo "<h4>Change field structure on table users</h4>";
 	$table_name = TABLE_PREFIX.'users';
 	$field_name = 'confirm_code';
 	$description = "VARCHAR( 32 ) NOT NULL DEFAULT '' AFTER `password` ";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
 	$table_name = TABLE_PREFIX.'users';
 	$field_name = 'confirm_timeout';
 	$description = "INT(11) NOT NULL DEFAULT '0' AFTER `confirm_code` ";
-    add_modify_field_in_database($table_name,$field_name,$description);
+	add_modify_field_in_database($table_name,$field_name,$description);
 
-    if($bDebugModus) {
-        echo implode(PHP_EOL,$aDebugMessage);
-    }
-    echo '</div>';
+	if($bDebugModus) {
+	    echo implode(PHP_EOL,$aDebugMessage);
+	}
+	echo '</div>';
 
-    $aDebugMessage = array();
-   /**********************************************************
-    * Updating group_id in table users
-    */
+	$aDebugMessage = array();
+	/**********************************************************
+	* Updating group_id in table users
+	*/
 	echo '<div style="margin-left:2em;">';
 	echo "<h4>Updating users groups permissions on table groups</h4>";
-        $aUsers = array();
+	    $aUsers = array();
 		// Get existing values
         $sql  = 'SELECT * FROM `'.TABLE_PREFIX.'users` ' ;
         $sql .= 'WHERE `user_id` != 1 ';
@@ -785,15 +772,15 @@
                 $aDebugMessage[] = $database->is_error()==false ? $sMessage." $OK<br />" : $sMessage." $FAIL!<br />";
         }
         unset($aUsers);
-    $aDebugMessage[] = '</div>';
+	$aDebugMessage[] = '</div>';
 
-    if($bDebugModus) {
-    // $aDebugMessage[] =
-        echo implode(PHP_EOL,$aDebugMessage);
-    }else {
-        echo '<span><strong>'.$iTotalUsers.' users updating the groups</strong></span>'." $OK<br />";
-        echo '</div>';
-    }
+	if($bDebugModus) {
+	// $aDebugMessage[] =
+	    echo implode(PHP_EOL,$aDebugMessage);
+	}else {
+	    echo '<span><strong>'.$iTotalUsers.' users updating the groups</strong></span>'." $OK<br />";
+	    echo '</div>';
+	}
 }
 
 $aDebugMessage = array();
@@ -800,18 +787,18 @@
 echo '<h3>Step '.(++$stepID).': Updating access and protected files in folders</h3>';
 
 echo '<div style="margin-left:2em;">';
-    /**********************************************************
-    * upgrade media directory index protect files
-    */
-    $dir = (WB_PATH.MEDIA_DIRECTORY);
-    echo '<h4>Upgrade media directory '.MEDIA_DIRECTORY.'/ index.php protect files</h4>';
-    $aDebugMessage = rebuildFolderProtectFile($dir);
-    if( sizeof( $aDebugMessage ) ){
-    	echo '<span><strong>Upgrade '.sizeof( $aDebugMessage ).' directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $OK<br />";
-    } else {
-    	echo '<span><strong>Upgrade directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $FAIL!<br />";
-    	echo implode ('<br />',$aDebugMessage);
-    }
+	/**********************************************************
+	* upgrade media directory index protect files
+	*/
+	$dir = (WB_PATH.MEDIA_DIRECTORY);
+	echo '<h4>Upgrade media directory '.MEDIA_DIRECTORY.'/ index.php protect files</h4>';
+	$aDebugMessage = rebuildFolderProtectFile($dir);
+	if( sizeof( $aDebugMessage ) ){
+		echo '<span><strong>Upgrade '.sizeof( $aDebugMessage ).' directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $OK<br />";
+	} else {
+		echo '<span><strong>Upgrade directory '.MEDIA_DIRECTORY.'/ protect files</strong></span>'." $FAIL!<br />";
+		echo implode ('<br />',$aDebugMessage);
+	}
 
     $aDebugMessage = array();
     /**********************************************************
@@ -965,7 +952,9 @@
 	 * upgrade modules if newer version is available
 	 * $aModuleList list of proofed modules
 	 */
-	$aModuleList = array('wysiwyg','form','code','captcha_control','output_filter');
+	$aModuleList = array(
+	              'captcha_control','code','form','menu_link',
+	              'output_filter','wysiwyg');
 	if(sizeof($aModuleList)) 
 	{
 		echo '<h3>Step '.(++$stepID).': Upgrade proofed modules</h3>';
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1893)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1894)
@@ -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', '1893');
+if(!defined('REVISION')) define('REVISION', '1894');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/install/sql/wb_search_data.sql
===================================================================
--- branches/2.8.x/wb/install/sql/wb_search_data.sql	(revision 1893)
+++ branches/2.8.x/wb/install/sql/wb_search_data.sql	(revision 1894)
@@ -6,7 +6,7 @@
 --
 INSERT INTO `{TABLE_PREFIX}search` VALUES(1, 'header', '<h1>[TEXT_SEARCH]</h1>\r\n<form name="searchpage" action="[WB_URL]/search/index.php" method="get">\r\n<table cellpadding="3" cellspacing="0" border="0" style="width:100%; max-width:500px">\r\n<tr>\r\n<td>\r\n<input type="hidden" name="search_path" value="[SEARCH_PATH]" />\r\n<input type="hidden" name="referrer" value="[REFERRER]" />\r\n<input type="text" name="string" value="[SEARCH_STRING]" style="width: 100%;" />\r\n</td>\r\n<td width="100">\r\n<input type="submit" value="[TEXT_SEARCH]" style="width: 100%;" />\r\n</td>\r\n</tr>\r\n<tr>\r\n<td colspan="2">\r\n<input type="radio" name="match" id="match_all" value="all"[ALL_CHECKED] />\r\n<label for="match_all">[TEXT_ALL_WORDS]</label>\r\n<input type="radio" name="match" id="match_any" value="any"[ANY_CHECKED] />\r\n<label for="match_any">[TEXT_ANY_WORDS]</label>\r\n<input type="radio" name="match" id="match_exact" value="exact"[EXACT_CHECKED] />\r\n<label for="match_exact">[TEXT_EXACT_MATCH]</label>\r\n</td>\r\n</tr>\r\n</table>\r\n</form>\r\n<hr />', '');
 INSERT INTO `{TABLE_PREFIX}search` VALUES(2, 'footer', '', '');
-INSERT INTO `{TABLE_PREFIX}search` VALUES(3, 'results_header', '<p>[TEXT_RESULTS_FOR] "<strong>[SEARCH_STRING]</strong>":</p>\r\n<div class="searchresults">', '');
+INSERT INTO `{TABLE_PREFIX}search` VALUES(3, 'results_header', '<p>[TEXT_RESULTS_FOR] <strong>[SEARCH_STRING]</strong>:</p>\r\n<div class="searchresults">', '');
 INSERT INTO `{TABLE_PREFIX}search` VALUES(4, 'results_loop', '<h3 style="margin:10px 0 3px 0;"><a href="[LINK]">[TITLE]</a></h3>\r\n<div style="font-size:0.8em;">[TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] [TEXT_ON] [DATE]</div>\r\n<p style="padding: 0 0 5px 0; margin: 2px 0 10px 0; border-bottom: 1px solid #777;">[DESCRIPTION].. [EXCERPT]</p>', '');
 INSERT INTO `{TABLE_PREFIX}search` VALUES(5, 'results_footer', '</div>', '');
 INSERT INTO `{TABLE_PREFIX}search` VALUES(6, 'no_results', '<p>[TEXT_NO_RESULTS]</p>', '');
Index: branches/2.8.x/wb/modules/menu_link/sql/mod_menu_link.sql
===================================================================
--- branches/2.8.x/wb/modules/menu_link/sql/mod_menu_link.sql	(nonexistent)
+++ branches/2.8.x/wb/modules/menu_link/sql/mod_menu_link.sql	(revision 1894)
@@ -0,0 +1,25 @@
+-- phpMyAdmin SQL Dump
+-- version 3.5.7
+-- Erstellungszeit: 15. Mrz 2013 um 18:21
+--
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+-- --------------------------------------------------------
+-- Database structure for WebsiteBaker core
+--
+-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
+--
+-- --------------------------------------------------------
+--
+-- Tabellenstruktur für Tabelle `{TABLE_PREFIX}mod_menu_link`
+--
+DROP TABLE IF EXISTS `{TABLE_PREFIX}mod_menu_link`;
+CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}mod_menu_link` (
+  `section_id` int(11) NOT NULL DEFAULT '0',
+  `page_id` int(11) NOT NULL DEFAULT '0',
+  `target_page_id` int(11) NOT NULL DEFAULT '0',
+  `redirect_type` int(11) NOT NULL DEFAULT '301',
+  `anchor` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
+  `extern` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  PRIMARY KEY (`section_id`)
+){TABLE_ENGINE};
+-- EndOfFile
\ No newline at end of file
Index: branches/2.8.x/wb/modules/menu_link/info.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/info.php	(revision 1893)
+++ branches/2.8.x/wb/modules/menu_link/info.php	(revision 1894)
@@ -1,46 +1,44 @@
-<?php
-/**
- *
- * @category        modules
- * @package         Menu Link
- * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wysiwyg/modify.php $
- * @lastmodified    $Date: 2011-01-11 20:29:52 +0100 (Di, 11 Jan 2011) $
- *
- */
-
-
-/* History:
-2.8 - June 2009
-- Improved the pagelist (thorn)
-- Added different redirect types 301 or 302 (thorn)
-- Set platform version 2.8
-
-2.7 - 24. Jan. 2008 - doc
-- added language support, changed platform to 2.7
-
-2.6.1.1 - 16. Jan. 2008 - thorn
-- added table mod_menu_link
-- added install.php, delete.php, add.php
-- changed wb/index.php: redirect if page is menu_link
-- removed special-handling of menu_link in: admin/pages/settings2.php
-
-*/
-
-$module_directory = 'menu_link';
-$module_name = 'Menu Link';
-$module_function = 'page';
-$module_version = '2.8';
-$module_platform = '2.8.x';
-$module_author = 'Ryan Djurovich, thorn';
-$module_license = 'GNU General Public License';
-$module_description = 'This module allows you to insert a link into the menu.';
-
-?>
\ No newline at end of file
+<?php
+/**
+ *
+ * @category        modules
+ * @package         Menu Link
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
+ * @link            http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource      $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/modules/wysiwyg/modify.php $
+ * @lastmodified    $Date: 2011-01-11 20:29:52 +0100 (Di, 11 Jan 2011) $
+ *
+ */
+
+
+/* History:
+2.8 - June 2009
+- Improved the pagelist (thorn)
+- Added different redirect types 301 or 302 (thorn)
+- Set platform version 2.8
+
+2.7 - 24. Jan. 2008 - doc
+- added language support, changed platform to 2.7
+
+2.6.1.1 - 16. Jan. 2008 - thorn
+- added table mod_menu_link
+- added install.php, delete.php, add.php
+- changed wb/index.php: redirect if page is menu_link
+- removed special-handling of menu_link in: admin/pages/settings2.php
+
+*/
+
+$module_directory = 'menu_link';
+$module_name = 'Menu Link';
+$module_function = 'page';
+$module_version = '2.8.1';
+$module_platform = '2.8.4';
+$module_author = 'Ryan Djurovich, thorn';
+$module_license = 'GNU General Public License';
+$module_description = 'This module allows you to insert a link into the menu.';
Index: branches/2.8.x/wb/modules/menu_link/install.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/install.php	(revision 1893)
+++ branches/2.8.x/wb/modules/menu_link/install.php	(revision 1894)
@@ -4,37 +4,27 @@
  * @category        modules
  * @package         menu_link
  * @author          Ryan Djurovich, WebsiteBaker Project
- * @copyright       2009-2012, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
+ * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
+ * @version         $Id$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
 
-// Must include code to stop this file being access directly
 /* -------------------------------------------------------- */
-if(defined('WB_PATH') == false)
-{
-	// Stop this file being access directly
-		die('<h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2>');
+// Must include code to stop this file being accessed directly
+if(!defined('WB_PATH')) {
+	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
+	throw new IllegalFileException();
+} else {
+	$database = WbDatabase::getInstance();
+	$sError = '';
+	// Create table
+	if(!$database->SqlImport(dirname(__FILE__).'/sql/mod_menu_link.sql','',false)){
+		$sError = $database->get_error();
+	}
 }
-/* -------------------------------------------------------- */
-
-$table = TABLE_PREFIX ."mod_menu_link";
-$database->query("DROP TABLE IF EXISTS `$table`");
-
-$database->query("
-	CREATE TABLE IF NOT EXISTS `$table` (
-		`section_id` INT(11) NOT NULL DEFAULT '0',
-		`page_id` INT(11) NOT NULL DEFAULT '0',
-		`target_page_id` INT(11) NOT NULL DEFAULT '0',
-		`redirect_type` INT NOT NULL DEFAULT '301',
-		`anchor` VARCHAR(255) NOT NULL DEFAULT '0' ,
-		`extern` VARCHAR(255) NOT NULL DEFAULT '' ,
-		PRIMARY KEY (`section_id`)
-	) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
-");
Index: branches/2.8.x/wb/modules/menu_link/upgrade.php
===================================================================
--- branches/2.8.x/wb/modules/menu_link/upgrade.php	(revision 1893)
+++ branches/2.8.x/wb/modules/menu_link/upgrade.php	(revision 1894)
@@ -4,7 +4,7 @@
  * @category        modules
  * @package         menu_link
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
+ * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
@@ -14,24 +14,77 @@
  * @lastmodified    $Date$
  *
  */
-// Must include code to stop this file being access directly
+
 /* -------------------------------------------------------- */
-if(defined('WB_PATH') == false)
-{
-	// Stop this file being access directly
-		die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+// Must include code to stop this file being accessed directly
+if(!defined('WB_URL')) {
+	require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php');
+	throw new IllegalFileException();
 }
 /* -------------------------------------------------------- */
 
-$msg = '';
-$sTable = TABLE_PREFIX.'mod_menu_link';
-if(($sOldType = $database->getTableEngine($sTable))) {
-	if(('myisam' != strtolower($sOldType))) {
-		if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) {
-			$msg = $database->get_error();
+	function mod_menu_link_upgrade($bDebug=false) {
+		global $OK ,$FAIL;
+		$database=WbDatabase::getInstance();
+		$msg = array();
+		$callingScript = $_SERVER["SCRIPT_NAME"];
+		// check if upgrade startet by upgrade-script to echo a message
+		$tmp = 'upgrade-script.php';
+		$globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0;
+// check for missing tables, if true stop the upgrade
+		$aTable = array('mod_menu_link');
+		$aPackage = UpgradeHelper::existsAllTables($aTable);
+		if( sizeof($aPackage) > 0){
+			$msg[] =  'TABLE '.implode(' missing! '.$FAIL.'<br />TABLE ',$aPackage).' missing! '.$FAIL;
+			$msg[] = 'Menu_Link upgrade failed'." $FAIL";
+			if($globalStarted) {
+				echo '<strong>'.implode('<br />',$msg).'</strong><br />';
+			}
+			return ( ($globalStarted==true ) ? $globalStarted : $msg);
+		} else {
+			for($x=0; $x<sizeof($aTable);$x++) {
+				if(($sOldType = $database->getTableEngine($database->TablePrefix.$aTable[$x]))) {
+					if(('myisam' != strtolower($sOldType))) {
+						if(!$database->query('ALTER TABLE `'.$database->TablePrefix.$aTable[$x].'` Engine = \'MyISAM\' ')) {
+							$msg[] = $database->get_error();
+						} else{
+							$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` changed to Engine = \'MyISAM\''." $OK";
+						}
+					} else {
+						$msg[] = 'TABLE `'.$database->TablePrefix.$aTable[$x].'` has Engine = \'MyISAM\''." $OK";
+					}
+				} else {
+					$msg[] = $database->get_error();
+				}
+			}
+// change table structure
+			$sTable = $database->TablePrefix.'mod_menu_link';
+			$sFieldName = 'redirect_type';
+			$sDescription = "INT NOT NULL DEFAULT '301' AFTER `target_page_id`";
+			if(!$database->field_modify($sTable,$sFieldName,$sDescription)) {
+				$msg[] = ''.$database->get_error();
+			} else {
+				$msg[] = 'Field ( `redirect_type` ) description has been changed successfully'." $OK";
+			}
+// only for upgrade-script
+			if($globalStarted) {
+				if($bDebug) {
+					echo '<strong>'.implode('<br />',$msg).'</strong><br />';
+				}
+			}
 		}
+		$msg[] = 'Menu_Link upgrade successfull finished ';
+		if($globalStarted) {
+			echo "<strong>Menu_Link upgrade successfull finished $OK</strong><br />";
+		}
+		return ( ($globalStarted==true ) ? $globalStarted : $msg);
 	}
-} else {
-	$msg = $database->get_error();
+// ------------------------------------
+
+$bDebugModus = ((isset($bDebugModus)) ? $bDebugModus : false);
+// Don't show the messages twice
+if( is_array($msg = mod_menu_link_upgrade($bDebugModus))) {
+	echo '<strong>'.implode('<br />',$msg).'</strong><br />';
 }
+
 // ------------------------------------
\ No newline at end of file
Index: branches/2.8.x/wb/modules/form/install.php
===================================================================
--- branches/2.8.x/wb/modules/form/install.php	(revision 1893)
+++ branches/2.8.x/wb/modules/form/install.php	(revision 1894)
@@ -4,13 +4,13 @@
  * @category        modules
  * @package         form
  * @author          WebsiteBaker Project
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, Website Baker Org. e.V.
+ * @link            http://www.websitebaker2.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.8.x
  * @requirements    PHP 5.2.2 and higher
- * @version      	$Id$
- * @filesource		$HeadURL$
+ * @version         $Id$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
@@ -21,9 +21,9 @@
 	throw new IllegalFileException();
 } else {
 // Create tables
-	$sError = array();
+	$aError = array();
 	// Create table
 	if(!$database->SqlImport(dirname(__FILE__).'/sql/form284db.sql','',false)){
-		$sError[] = $database->get_error();
+		$aError[] = $database->get_error();
 	}
 }
Index: branches/2.8.x/wb/modules/form/sql/form284db.sql
===================================================================
--- branches/2.8.x/wb/modules/form/sql/form284db.sql	(revision 1893)
+++ branches/2.8.x/wb/modules/form/sql/form284db.sql	(revision 1894)
@@ -37,7 +37,7 @@
   `footer` text{TABLE_COLLATION} NOT NULL,
   `email_to` text{TABLE_COLLATION} NOT NULL,
   `email_from` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `email_fromname` varchar(255){TABLE_COLLATION}) NOT NULL DEFAULT '',
+  `email_fromname` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
   `email_subject` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
   `success_page` text{TABLE_COLLATION} NOT NULL,
   `success_email_to` text{TABLE_COLLATION} NOT NULL,