From 00d42426f2fcf7f3451d4f6745d7f9f79feaaeba Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 26 Sep 2011 03:36:24 -0400
Subject: [PATCH] Fix merging of annotation results when querying multiple attributes
---
program/include/iniset.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 14cc87e..9c9e2ec 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -28,6 +28,7 @@
'suhosin.session.encrypt' => 0,
'session.auto_start' => 0,
'file_uploads' => 1,
+ 'magic_quotes_runtime' => 0,
);
foreach ($crit_opts as $optname => $optval) {
if ($optval != ini_get($optname)) {
@@ -86,7 +87,6 @@
{
$filename = preg_replace(
array(
- '/rcube_/',
'/MDB2_(.+)/',
'/Mail_(.+)/',
'/Net_(.+)/',
@@ -95,7 +95,6 @@
'/^utf8$/',
),
array(
- INSTALL_PATH . 'program/include/rcube_',
'MDB2/\\1',
'Mail/\\1',
'Net/\\1',
--
Gitblit v1.9.1