Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2000)
+++ branches/2.8.x/CHANGELOG	(revision 2001)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+14 Nov-2013 Build 2001 Dietmar Woellbrink (Luisehahne)
+! /framework/class.wb.php::ShowMaintainScreen add locked maintenance message
+# /framework/initialize.php::readConfiguration taken back last change (Revision 1996)
 14 Nov-2013 Build 2000 Manuela v.d.Decken(DarkViper)
 ! WbAdaptor::getWbConstants() now on import skip constants holding database settings
 14 Nov-2013 Build 1999 Manuela v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2000)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2001)
@@ -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', '2000');
+if(!defined('REVISION')) define('REVISION', '2001');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 2000)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 2001)
@@ -115,7 +115,7 @@
 		if(is_readable($sSetupFile)) {
 			$aCfg = parse_ini_file($sSetupFile, true);
 			foreach($aCfg['Constants'] as $key=>$value) {
-				switch(strtoupper($key)):
+				switch($key):
 					case 'DEBUG':
 						$value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
 						if(!defined('DEBUG')) { define('DEBUG', $value); }
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 2000)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 2001)
@@ -549,10 +549,9 @@
 	public function ShowMaintainScreen($type = 'locked')
 	{
 		global $database, $MESSAGE;
-		$CHECK_BACK = $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'];
-		$BE_PATIENT = '';
 		$LANGUAGE   = strtolower((isset($_SESSION['LANGUAGE']) ? $_SESSION['LANGUAGE'] : LANGUAGE ));
-
+		$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'];
+		$PAGE_ICON  = 'negative';
 		$show_screen = false;
 		if($type == 'locked')
 		{
@@ -581,14 +580,11 @@
 		// delete the session itself
 				session_destroy();
 				$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_LOCKED'];
-				$BE_PATIENT = $MESSAGE['GENERIC_BE_PATIENT'];
 				$PAGE_ICON  = 'system';
 				$show_screen = true;
 			}
 		} else {
 			header($_SERVER['SERVER_PROTOCOL'].' 503 Service Unavailable');
-			$PAGE_TITLE = $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'];
-			$PAGE_ICON  = 'negative';
 			$show_screen = true;
 		}
 		if($show_screen)
@@ -606,14 +602,14 @@
     			} else {
     				$charset='utf-8';
     			}
-    		    $tpl->set_var( 'PAGE_TITLE', $MESSAGE['GENERIC_WEBSITE_UNDER_CONSTRUCTION'] );
+    		    $tpl->set_var( 'PAGE_TITLE', $PAGE_TITLE );
     	 	    $tpl->set_var( 'CHECK_BACK', $MESSAGE['GENERIC_PLEASE_CHECK_BACK_SOON'] );
     	 	    $tpl->set_var( 'CHARSET', $charset );
     	 	    $tpl->set_var( 'WB_URL', WB_URL );
-    	 	    $tpl->set_var( 'BE_PATIENT', $BE_PATIENT );
+    	 	    $tpl->set_var( 'BE_PATIENT', $MESSAGE['GENERIC_BE_PATIENT'] );
     	 	    $tpl->set_var( 'THEME_URL', THEME_URL );
     			$tpl->set_var( 'PAGE_ICON', $PAGE_ICON);
-    			$tpl->set_var( 'LANGUAGE', strtolower(LANGUAGE));
+    			$tpl->set_var( 'LANGUAGE', $LANGUAGE);
     		    $tpl->parse( 'main', 'main_block', false );
     		    $tpl->pparse( 'output', 'page' );
                 exit();