Imported Upstream version 0.3.1

[roundcube.git] / program / include / iniset.php

diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5d836860bb0add2587bde62248c5e7932b5cb582..df2f3f310445c0e3984a41bf6497293abd48ac92 100755 (executable)
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -16,13 +16,13 @@
  |         Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: iniset.php 2916 2009-09-04 10:58:29Z thomasb $
+ $Id: iniset.php 3081 2009-10-31 13:20:02Z thomasb $
 
 */
 
 
 // application constants
-define('RCMAIL_VERSION', '0.3-stable');
+define('RCMAIL_VERSION', '0.3.1');
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
 
@@ -59,15 +59,10 @@ if  (isset($_SERVER['HTTPS'])) {
 ini_set('session.name', 'roundcube_sessid');
 ini_set('session.use_cookies', 1);
 ini_set('session.use_only_cookies', 1);
-if (function_exists('set_magic_quotes_runtime')) {
-  set_magic_quotes_runtime(0);
-}
 
 // increase maximum execution time for php scripts
 // (does not work in safe mode)
-if (!ini_get('safe_mode')) {
-  set_time_limit(120);
-}
+@set_time_limit(120);
 
 // set internal encoding for mbstring extension
 if(extension_loaded('mbstring'))