From 25bc871ee79a6d469822d999b09c9b5d73fccf1f Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Sun, 17 Apr 2016 12:22:20 -0400 Subject: [PATCH] Bump version to 1.1.5 --- program/include/iniset.php | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php index 35b5522..534d5ca 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,7 +5,7 @@ | program/include/iniset.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2008-2013, The Roundcube Dev Team | + | Copyright (C) 2008-2015, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -21,23 +21,8 @@ */ // application constants -define('RCMAIL_VERSION', '0.9-git'); +define('RCMAIL_VERSION', '1.1.5'); define('RCMAIL_START', microtime(true)); - -$config = array( - // Some users are not using Installer, so we'll check some - // critical PHP settings here. Only these, which doesn't provide - // an error/warning in the logs later. See (#1486307). - 'suhosin.session.encrypt' => 0, - 'session.auto_start' => 0, - 'file_uploads' => 1, -); -foreach ($config as $optname => $optval) { - if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) { - die("ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n" - ."Check your PHP configuration (including php_admin_flag)."); - } -} if (!defined('INSTALL_PATH')) { define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/'); @@ -69,6 +54,11 @@ // (does not work in safe mode) @set_time_limit(120); +// include composer autoloader (if available) +if (@file_exists(INSTALL_PATH . 'vendor/autoload.php')) { + require INSTALL_PATH . 'vendor/autoload.php'; +} + // include Roundcube Framework require_once 'Roundcube/bootstrap.php'; @@ -78,6 +68,14 @@ // backward compatybility (to be removed) require_once INSTALL_PATH . 'program/include/bc.php'; +// load the UTF-8 portability layers from Patchwork +// don't load mbstring layer as it conflicts with Roundcube Framework (#1490280) +if (!function_exists('iconv')) { + \Patchwork\Utf8\Bootup::initIconv(); +} +if (!function_exists('utf8_encode')) { + \Patchwork\Utf8\Bootup::initUtf8Encode(); +} /** * PHP5 autoloader routine for dynamic class loading @@ -94,4 +92,3 @@ return false; } - -- Gitblit v1.9.1