From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/include/iniset.php | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 80d3252..3d02630 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,23 +21,8 @@
*/
// application constants
-define('RCMAIL_VERSION', '0.9-rc');
+define('RCMAIL_VERSION', '0.9.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']).'/');
--
Gitblit v1.9.1