From e8cab44de0b3d8dbff7a091a743fab0d644d5267 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 30 Jul 2012 07:51:00 -0400
Subject: [PATCH] Set some php ini settings if possible

---
 program/include/iniset.php |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 43289db..9814253 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,11 +5,11 @@
  | program/include/iniset.php                                            |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Setup the application envoronment required to process               |
+ |   Setup the application environment required to process               |
  |   any request.                                                        |
  +-----------------------------------------------------------------------+
  | Author: Till Klampaeckel <till@php.net>                               |
@@ -29,15 +29,16 @@
     '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)) {
+    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.7.1');
+define('RCMAIL_VERSION', '0.7.2');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
 define('RCMAIL_START', microtime(true));

--
Gitblit v1.9.1