From 5b3a0a2797c8939b397f37dbb9cbf05a50622895 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 19 Oct 2012 09:30:51 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/program/include/iniset.php b/program/include/iniset.php
index a2f43b3..82278c9 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -34,7 +34,9 @@
 );
 foreach ($config as $optname => $optval) {
     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!");
+        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).\n"
+            ."Read REQUIREMENTS section in INSTALL file or use Roundcube Installer!");
     }
 }
 

--
Gitblit v1.9.1