From 408d14185788fc852d277c5cda5e405a09b533d0 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Aug 2012 15:28:46 -0400
Subject: [PATCH] Bump version to 0.8.1
---
program/include/iniset.php | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
old mode 100755
new mode 100644
index 14cc87e..f223b0d
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,8 +5,11 @@
| program/include/iniset.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2011, The Roundcube Dev Team |
- | Licensed under the GNU GPL |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Setup the application envoronment required to process |
@@ -20,23 +23,26 @@
*/
-// 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).
-$crit_opts = array(
- 'mbstring.func_overload' => 0,
+$config = array(
+ 'error_reporting' => E_ALL &~ (E_NOTICE | E_STRICT),
+ // 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).
+ 'mbstring.func_overload' => 0,
'suhosin.session.encrypt' => 0,
- 'session.auto_start' => 0,
- 'file_uploads' => 1,
+ 'session.auto_start' => 0,
+ 'file_uploads' => 1,
+ 'magic_quotes_runtime' => 0,
+ 'magic_quotes_sybase' => 0, // #1488506
);
-foreach ($crit_opts as $optname => $optval) {
- if ($optval != ini_get($optname)) {
+foreach ($config as $optname => $optval) {
+ if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
die("ERROR: Wrong '$optname' option value. Read REQUIREMENTS section in INSTALL file or use Roundcube Installer, please!");
}
}
// application constants
-define('RCMAIL_VERSION', '0.6-svn');
+define('RCMAIL_VERSION', '0.8.1');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
define('RCMAIL_START', microtime(true));
@@ -64,8 +70,6 @@
die("Fatal error: ini_set/set_include_path does not work.");
}
-ini_set('error_reporting', E_ALL&~E_NOTICE);
-
// increase maximum execution time for php scripts
// (does not work in safe mode)
@set_time_limit(120);
@@ -86,7 +90,6 @@
{
$filename = preg_replace(
array(
- '/rcube_/',
'/MDB2_(.+)/',
'/Mail_(.+)/',
'/Net_(.+)/',
@@ -95,7 +98,6 @@
'/^utf8$/',
),
array(
- INSTALL_PATH . 'program/include/rcube_',
'MDB2/\\1',
'Mail/\\1',
'Net/\\1',
--
Gitblit v1.9.1