Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1777)
+++ branches/2.8.x/CHANGELOG	(revision 1778)
@@ -13,6 +13,8 @@
 
 
 
+05 Oct-2012 Build 1778 Dietmar Woellbrink (Luisehahne)
+# fixed empty template variable in admin/start
 01 Oct-2012 Build 1777 Dietmar Woellbrink (Luisehahne)
 + add methode StripCodeFromText in class.wb to clean injection
 ! rebranding the admin/settings and security fixes
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1777)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1778)
@@ -58,7 +58,10 @@
 }
 // ---------------------------------------
 // check if it is neccessary to start the uograde-script
-$msg = '';
+$msg  = '';
+$msg .= (is_readable(WB_PATH.'/install/')) ?  $MESSAGE['START_INSTALL_DIR_EXISTS'].'<br />' : $msg;
+$msg .= (is_readable(WB_PATH.'/upgrade-script.php')) ?  $MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : '';
+//$msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />';
 
 // ---------------------------------------
 // check if it is neccessary to start the uograde-script
@@ -79,7 +82,6 @@
 		    exit;
 		}
 	}
-	$msg .= ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />';
 }
 // ---------------------------------------
 // workout to upgrade the groups system_permissions
@@ -129,6 +131,7 @@
 					'CURRENT_USER' => $MESSAGE['START_CURRENT_USER'],
 					'DISPLAY_NAME' => $admin->get_display_name(),
                     'DISPLAY_WARNING' => '',
+                    'WARNING' => '',
 					'ADMIN_URL' => ADMIN_URL,
 					'WB_URL' => WB_URL,
 					'THEME_URL' => THEME_URL,
@@ -137,7 +140,6 @@
 				)
 			);
 
-
 // Insert permission values into the template object
 $oTpl->set_block('main_block', 'show_pages_block', 'show_pages');
 if($admin->get_permission('pages') != true)
@@ -195,13 +197,6 @@
 	$oTpl->parse('show_preferences', 'show_preferences_block', true);
 }
 
-$oTpl->set_block('main_block', 'show_install_block', 'show_install');
-if($admin->ami_group_member('1') != true)
-{
-	$oTpl->set_block('show_install', '');
-} else {
-	$oTpl->parse('show_install', 'show_install_block', true);
-}
 
 /*
 if($admin->get_permission('pages') != true)
@@ -230,19 +225,27 @@
 }
 */
 
-$msg .= (file_exists(WB_PATH.'/install/')) ?  $MESSAGE['START_INSTALL_DIR_EXISTS'] : '';
 
-// Check if installation directory still exists
-if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
-	// Check if user is part of Adminstrators group
-	if($admin->get_user_id()==1)
-    {
-		$oTpl->set_var('WARNING', $msg );
-	} else {
-		$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
-	}
+$oTpl->set_block('main_block', 'show_install_block', 'show_install');
+if($admin->get_user_id() != 1)
+{
+	$oTpl->parse('show_install', '');
 } else {
-	$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
+
+    // Check if installation directory still exists
+    if(file_exists(WB_PATH.'/install/') || file_exists(WB_PATH.'/upgrade-script.php') ) {
+    	// Check if user is part of Adminstrators group
+    	if($admin->get_user_id()==1)
+        {
+    		$oTpl->set_var('WARNING', $msg );
+    	} else {
+    		$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
+    	}
+    } else {
+    	$oTpl->set_var('DISPLAY_WARNING', 'display:none;');
+    }
+
+	$oTpl->parse('show_install', 'show_install_block', true);
 }
 
 // Insert "Add-ons" section overview (pretty complex compared to normal)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1777)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1778)
@@ -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', '1777');
+if(!defined('REVISION')) define('REVISION', '1778');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/modules/output_filter/js/mdcr.js
===================================================================
--- branches/2.8.x/wb/modules/output_filter/js/mdcr.js	(revision 1777)
+++ branches/2.8.x/wb/modules/output_filter/js/mdcr.js	(revision 1778)
@@ -3,7 +3,7 @@
  * @copyright       2009-2012, WebsiteBaker Org. e.V.
  * @link            http://www.websitebaker.org/
  * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.3
+ * @platform        WebsiteBaker 2.8.4
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
  * @filesource      $HeadURL$