From 70306a4c75ddd70eb4886496df2bee63e0b09ac4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 20 Jun 2009 09:19:11 -0400
Subject: [PATCH] - support PEAR::Net_* in __autoload()
---
program/include/iniset.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 46f3750..8905161 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -34,7 +34,7 @@
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
- define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
+ define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');
}
// RC include folders MUST be included FIRST to avoid other
@@ -58,7 +58,7 @@
}
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
-ini_set('session.only_use_cookies', 1);
+ini_set('session.use_only_cookies', 1);
set_magic_quotes_runtime(0);
// increase maximum execution time for php scripts
@@ -83,12 +83,14 @@
$filename = preg_replace(
array('/MDB2_(.+)/',
'/Mail_(.+)/',
+ '/Net_(.+)/',
'/^html_.+/',
'/^utf8$/',
'/html2text/'
),
array('MDB2/\\1',
'Mail/\\1',
+ 'Net/\\1',
'html',
'utf8.class',
'lib/html2text' // see #1485505
--
Gitblit v1.9.1