Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1681)
+++ branches/2.8.x/CHANGELOG	(revision 1682)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+03 May-2012 Build 1682 Werner v.d.Decken(DarkViper)
+! some little corrections ModLanguage/Database/initialize.php
 03 May-2012 Build 1681 Werner v.d.Decken(DarkViper)
 ! reorganisation of default theme of oage-settings
 + added menu_icon_0 and menu_icon_1
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1681)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1682)
@@ -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', '1681');
+if(!defined('REVISION')) define('REVISION', '1682');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/initialize.php
===================================================================
--- branches/2.8.x/wb/framework/initialize.php	(revision 1681)
+++ branches/2.8.x/wb/framework/initialize.php	(revision 1682)
@@ -90,7 +90,8 @@
 	spl_autoload_register('CoreAutoloader'); // activate core autoloader
 	date_default_timezone_set('UTC');
 	// Create database class
-	$database = new Database();
+	$sSqlUrl = DB_TYPE.'://'.DB_USERNAME.':'.DB_PASSWORD.'@'.DB_HOST.'/'.DB_NAME;
+	$database = new Database($sSqlUrl);
 	// disable all kind of magic_quotes
 	if(get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
 		@ini_set('magic_quotes_sybase', 0);
Index: branches/2.8.x/wb/framework/Database.php
===================================================================
--- branches/2.8.x/wb/framework/Database.php	(revision 1681)
+++ branches/2.8.x/wb/framework/Database.php	(revision 1682)
@@ -31,7 +31,7 @@
 
 class Database {
 
-//	$sdb = 'mysql://user:password@demo.de:3604/datenbank';
+//	$sdb = 'mysql://user:password@demo.de:3306/datenbank';
 
 	private $_db_handle = null; // readonly from outside
 	private $_scheme    = 'mysql';
@@ -38,7 +38,7 @@
 	private $_hostname  = 'localhost';
 	private $_username  = '';
 	private $_password  = '';
-	private $_hostport  = '3406';
+	private $_hostport  = '3306';
 	private $_db_name   = '';
 
 	private $connected  = false;
@@ -61,11 +61,7 @@
 			$this->_hostport = $this->_hostport == '3306' ? '' : ':'.$this->_hostport;
 			$this->_db_name  = ltrim(isset($aIni['path']) ? $aIni['path'] : '', '/\\');
 		}else {
-			$this->_hostname = DB_HOST;
-			$this->_username = DB_USERNAME;
-			$this->_password = DB_PASSWORD;
-			$this->_hostport = '';
-			$this->_db_name  = DB_NAME;
+			throw new RuntimeException('Missing parameter: unable to connect database');
 		}
 		// Connect to database
 		$this->connect();
Index: branches/2.8.x/wb/framework/ModLanguage.php
===================================================================
--- branches/2.8.x/wb/framework/ModLanguage.php	(revision 1681)
+++ branches/2.8.x/wb/framework/ModLanguage.php	(revision 1682)
@@ -1,10 +1,10 @@
 <?php
 /**
- * @category     Core
- * @package      Core_security
+ * @category     WebsiteBaker
+ * @package      WebsiteBaker_Core
  * @author       Werner v.d.Decken
- * @copyright    ISTeasy-project(http://isteasy.de/)
- * @license      Creative Commons BY-SA 3.0 http://creativecommons.org/licenses/by-sa/3.0/
+ * @copyright    WebsiteBaker Org e.V.
+ * @license      http://www.gnu.org/licenses/gpl.html
  * @version      $Id$
  * @filesource   $HeadURL$
  * @since        Datei vorhanden seit Release 2.8.2
@@ -56,6 +56,7 @@
 		   $this->_sCurrentLanguage != $sLanguage ||
 		   $this->_sDefaultLanguage != $sDefault)
 		{
+		// only load language if not already loaded
 			$this->_sLanguageDirectory = rtrim($sLangDir, '/').'/';
 			$this->_sCurrentLanguage = $sLanguage;
 			$this->_sDefaultLanguage = $sDefault;