From fe82e213c3181de85f450fae63aa163c4467cd72 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 31 Jul 2015 07:14:35 -0400
Subject: [PATCH] Fix so E_DEPRECATED errors from PEAR libs are ignored by error_reporting change (#1490281)

---
 CHANGELOG                           |    1 +
 program/lib/Roundcube/bootstrap.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c73740d..f7ba570 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@
 - Fix draft removal after a message is sent and storing sent message is disabled (#1490467)
 - Fix so imap folder attribute comparisons are case-insensitive (#1490466)
 - Fix bug where new messages weren't added to the list in search mode
+- Fix so E_DEPRECATED errors from PEAR libs are ignored by error_reporting change (#1490281)
 
 RELEASE 1.1.2
 -------------
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 0509c6b..bbc3c50 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -26,7 +26,7 @@
  */
 
 $config = array(
-    'error_reporting'         => E_ALL & ~E_NOTICE & ~E_STRICT,
+    'error_reporting'         => E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED,
     // Some users are not using Installer, so we'll check some
     // critical PHP settings here. Only these, which doesn't provide
     // an error/warning in the logs later. See (#1486307).

--
Gitblit v1.9.1