Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1864)
+++ branches/2.8.x/CHANGELOG	(revision 1865)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+19 Feb-2013 Build 1865 Werner v.d.Decken(DarkViper)
+! update initialize.php for changed Twig-dir and activated cache in Translate
+! initialize can handle now the new setup.ini format also.
 19 Feb-2013 Build 1864 Werner v.d.Decken(DarkViper)
 ! update classes Translate, TranslateTable, TranslateAdaptorWbOldStyle
 + added interface TranslateAdaptorInterface
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1864)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1865)
@@ -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', '1864');
+if(!defined('REVISION')) define('REVISION', '1865');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1864)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1865)
@@ -142,8 +142,16 @@
 			@ini_set('magic_quotes_runtime', 0);
 		}
 	}
+// load db configuration ---
+	if(defined('DB_TYPE')) {
+		$aSqlData = array( 0 => DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME);
+	}else {
+		$aSqlData = readConfiguration($sDbConnectType);
+	}
+// sanitize $_SERVER['HTTP_REFERER'] ---
+	SanitizeHttpReferer(WB_URL); 
+	SetInstallPathConstants();
 // define constant systemenvironment settings ---
-	SetInstallPathConstants();
 	date_default_timezone_set('UTC');
 	if(!defined('MAX_TIME')) { define('MAX_TIME', (pow(2, 31)-1)); } // 32-Bit Timestamp of 19 Jan 2038 03:14:07 GMT
 	if(!defined('DO_NOT_TRACK')) { define('DO_NOT_TRACK', (isset($_SERVER['HTTP_DNT']))); }
@@ -152,8 +160,7 @@
 	if(!class_exists('WbAutoloader', false)){ include($sTmp); }
 	WbAutoloader::doRegister(array(ADMIN_DIRECTORY=>'a', 'modules'=>'m'));
 // register TWIG autoloader ---
-//	$sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php';
-	$sTmp = dirname(dirname(__FILE__)).'/include/Twig/Autoloader.php';
+	$sTmp = dirname(dirname(__FILE__)).'/include/Sensio/Twig/lib/Twig/Autoloader.php';
 	if(!class_exists('Twig_Autoloader', false)){ include($sTmp); }
 	Twig_Autoloader::register();
 // aktivate exceptionhandler ---
@@ -160,14 +167,6 @@
 	if(!function_exists('globalExceptionHandler')) {
 		include(dirname(__FILE__).'/globalExceptionHandler.php');
 	}
-// load db configuration ---
-	if(defined('DB_TYPE')) {
-		$aSqlData = array( 0 => DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME);
-	}else {
-		$aSqlData = readConfiguration($sDbConnectType);
-	}
-// sanitize $_SERVER['HTTP_REFERER'] ---
-	SanitizeHttpReferer(WB_URL); 
 // ---------------------------
 // Create global database instance ---
 	$database = WbDatabase::getInstance();
@@ -283,6 +282,7 @@
 	Translate::getInstance()->initialize('en',
 	                                     (defined('DEFAULT_LANGUAGE') ? DEFAULT_LANGUAGE : ''), 
 	                                     (defined('LANGUAGE') ? LANGUAGE : ''), 
-	                                     'WbOldStyle');
+	                                     'WbOldStyle',
+	                                     Translate::CACHE_ENABLED);
 // *** END OF FILE ***********************************************************************
 	
\ No newline at end of file