Index: branches/main/admin/interface/version.php
===================================================================
--- branches/main/admin/interface/version.php	(revision 10)
+++ branches/main/admin/interface/version.php	(revision 11)
@@ -48,6 +48,6 @@
 
 // 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.10.1-dev'); }
-if(!defined('REVISION')) { define('REVISION', '10'); }
+if(!defined('REVISION')) { define('REVISION', '11'); }
 if(!defined('SP')) { define('SP', ''); }
 
Index: branches/main/framework/class.database.php
===================================================================
--- branches/main/framework/class.database.php	(revision 10)
+++ branches/main/framework/class.database.php	(revision 11)
@@ -1,23 +1,18 @@
 <?php
 /**
  *
- * @category        framework
- * @package         database
- * @copyright       WebsiteBaker Org. e.V.
- * @link            http://websitebaker.org/
- * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.8.3
- * @requirements    PHP 5.3.6 and higher
- * @version         $Id$
- * @filesource      $HeadURL$
- * @lastmodified    $Date$
- *
+ * @package      Core
+ * @copyright    WebsiteBaker Org. e.V.
+ * @author       Ryan Djurovich
+ * @author       Manuela v.d.Decken <manuela@isteam.de>
+ * @author       Dietmar Wöllbrink <luisehahne@websitebaker.org>
+ * @license      GNU General Public License 2.0
+ * @version      3.0.1
+ * @requirements PHP 5.6.x and higher
+ * @revision     $Id$
+ * @deprecated   no / since 0000/00/00
+ * @description  This class will be used to interface between the database and the Website Baker code
  */
-/*
-Database class
-This class will be used to interface between the database
-and the Website Baker code
-*/
 
 
     define('DATABASE_CLASS_LOADED', true);
@@ -62,7 +57,9 @@
     {
         $aTmp = preg_split(
             '/[^a-z0-9]/i',
-            strtolower(preg_replace('/[^a-z0-9_]/i', '', (defined('DB_CHARSET') ? DB_CHARSET : 'utf8mb4_unicode_ci')))
+            strtolower(preg_replace('/[^a-z0-9_]/i', '', (defined('DB_CHARSET') ? DB_CHARSET : 'utf8mb4_unicode_ci'))),
+            null,
+            PREG_SPLIT_NO_EMPTY
         );
         $this->sCharset = $aTmp[0];
         $this->sCollation = implode('_', $aTmp);