Revision 11
Added by Manuela about 7 years ago
| branches/main/admin/interface/version.php | ||
|---|---|---|
| 48 | 48 |
|
| 49 | 49 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 50 | 50 |
if(!defined('VERSION')) { define('VERSION', '2.10.1-dev'); }
|
| 51 |
if(!defined('REVISION')) { define('REVISION', '10'); }
|
|
| 51 |
if(!defined('REVISION')) { define('REVISION', '11'); }
|
|
| 52 | 52 |
if(!defined('SP')) { define('SP', ''); }
|
| 53 | 53 |
|
| branches/main/framework/class.database.php | ||
|---|---|---|
| 1 | 1 |
<?php |
| 2 | 2 |
/** |
| 3 | 3 |
* |
| 4 |
* @category framework
|
|
| 5 |
* @package database
|
|
| 6 |
* @copyright WebsiteBaker Org. e.V.
|
|
| 7 |
* @link http://websitebaker.org/
|
|
| 8 |
* @license http://www.gnu.org/licenses/gpl.html
|
|
| 9 |
* @platform WebsiteBaker 2.8.3
|
|
| 10 |
* @requirements PHP 5.3.6 and higher
|
|
| 11 |
* @version $Id$
|
|
| 12 |
* @filesource $HeadURL$
|
|
| 13 |
* @lastmodified $Date$
|
|
| 14 |
* |
|
| 4 |
* @package Core
|
|
| 5 |
* @copyright WebsiteBaker Org. e.V.
|
|
| 6 |
* @author Ryan Djurovich
|
|
| 7 |
* @author Manuela v.d.Decken <manuela@isteam.de>
|
|
| 8 |
* @author Dietmar Wöllbrink <luisehahne@websitebaker.org>
|
|
| 9 |
* @license GNU General Public License 2.0
|
|
| 10 |
* @version 3.0.1
|
|
| 11 |
* @requirements PHP 5.6.x and higher
|
|
| 12 |
* @revision $Id$
|
|
| 13 |
* @deprecated no / since 0000/00/00
|
|
| 14 |
* @description This class will be used to interface between the database and the Website Baker code
|
|
| 15 | 15 |
*/ |
| 16 |
/* |
|
| 17 |
Database class |
|
| 18 |
This class will be used to interface between the database |
|
| 19 |
and the Website Baker code |
|
| 20 |
*/ |
|
| 21 | 16 |
|
| 22 | 17 |
|
| 23 | 18 |
define('DATABASE_CLASS_LOADED', true);
|
| ... | ... | |
| 62 | 57 |
{
|
| 63 | 58 |
$aTmp = preg_split( |
| 64 | 59 |
'/[^a-z0-9]/i', |
| 65 |
strtolower(preg_replace('/[^a-z0-9_]/i', '', (defined('DB_CHARSET') ? DB_CHARSET : 'utf8mb4_unicode_ci')))
|
|
| 60 |
strtolower(preg_replace('/[^a-z0-9_]/i', '', (defined('DB_CHARSET') ? DB_CHARSET : 'utf8mb4_unicode_ci'))),
|
|
| 61 |
null, |
|
| 62 |
PREG_SPLIT_NO_EMPTY |
|
| 66 | 63 |
); |
| 67 | 64 |
$this->sCharset = $aTmp[0]; |
| 68 | 65 |
$this->sCollation = implode('_', $aTmp);
|
Also available in: Unified diff
little fix for charset settings