Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2009)
+++ branches/2.8.x/CHANGELOG	(revision 2010)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+03 Nov-2013 Build 2010 Manuela v.d.Decken(DarkViper)
+! WbAutoloader added possibility to load classes with additional file prefix 'class.'
 27 Nov-2013 Build 2009 Manuela v.d.Decken(DarkViper)
 ! framework/functions-utf8::entities_to_7bit() deprecated warning for modifier /e in preg_replace() corrected
 25 Nov-2013 Build 2008 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 2009)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2010)
@@ -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', '2009');
+if(!defined('REVISION')) define('REVISION', '2010');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/WbAutoloader.php
===================================================================
--- branches/2.8.x/wb/framework/WbAutoloader.php	(revision 2009)
+++ branches/2.8.x/wb/framework/WbAutoloader.php	(revision 2010)
@@ -16,11 +16,14 @@
  */
 	static public function doRegister(array $aDirectories)
 	{
-		if(!sizeof(self::$_aSearchpatterns)) {
-			if(sizeof($aDirectories > 0)) {
+		if(!sizeof(self::$_aSearchpatterns))
+		{
+			if(sizeof($aDirectories > 0))
+			{
 				self::$_aSearchpatterns[] = '/(^.[^_].*$)/i';
-				self::$_aReplacements[] = basename(dirname(__FILE__)).'_$1';
-				foreach($aDirectories as $value => $shortKey) {
+				self::$_aReplacements[] = basename(dirname(__FILE__)).'_\1';
+				foreach($aDirectories as $value => $shortKey)
+				{
 					self::$_aSearchpatterns[] = '/^'.$shortKey.'_/i';
 					self::$_aReplacements[] = $value.'_';
 				}
@@ -34,15 +37,14 @@
  */
 	static public function CoreAutoloader($sClassName)
 	{
-		if($sClassName == 'database'){
-			$sFileName = dirname(__FILE__).'/class.database.php';
-			if(is_file($sFileName)) { include($sFileName); }
-		}else {
-			$sClassName = preg_replace(self::$_aSearchpatterns, self::$_aReplacements, $sClassName);
-			$sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php';
-			if(is_file($sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php')) {
-				include($sFileName);
+		$sClassName = preg_replace(self::$_aSearchpatterns, self::$_aReplacements, $sClassName);
+		$sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php';
+		if (!is_file($sFileName = dirname(dirname(__FILE__)).'/'.str_replace('_', '/', $sClassName).'.php')) {
+		// alternatively search for file with prefix 'class.'
+			if (!is_file(($sFileName = dirname($sFileName).'/class.'.basename($sFileName)))) {
+				return false;
 			}
 		}
+		include($sFileName);
 	}
 } // end class Autoloader
\ No newline at end of file