From b1fa85b7e8ded3d8b935456b9490f3aa2712e93a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 04 Mar 2012 03:03:26 -0500
Subject: [PATCH] - Disable E_STRICT warnings on PHP 5.4

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

diff --git a/CHANGELOG b/CHANGELOG
index c7fef7d..dc64464 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Disable E_STRICT warnings on PHP 5.4
 - Prevent from folder selection on virtual folder collapsing (#1488346)
 - Fix automatic unsubscribe of non-existent folders
 - Fix double-quotes handling in recipient names
diff --git a/program/include/iniset.php b/program/include/iniset.php
index eb015a6..43289db 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -65,7 +65,7 @@
     die("Fatal error: ini_set/set_include_path does not work.");
 }
 
-ini_set('error_reporting', E_ALL&~E_NOTICE);
+ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT));
 
 // increase maximum execution time for php scripts
 // (does not work in safe mode)

--
Gitblit v1.9.1