[eGroupWare-svn] r47106 - in /branches/1.8: phpgwapi/inc/functions.inc.php setup/inc/functions.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Tue May 27 17:05:13 2014
New Revision: 47106

URL: http://svn.stylite.de/viewvc/egroupware?rev=47106&view=rev
Log:
* PHP 5.5: disabling deprecated warnings of 5.5 eg. preg_replace with /e

Modified:
    branches/1.8/phpgwapi/inc/functions.inc.php
    branches/1.8/setup/inc/functions.inc.php

Modified: branches/1.8/phpgwapi/inc/functions.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/phpgwapi/inc/functions.inc.php?rev=47106&r1=47105&r2=47106&view=diff
==============================================================================
--- branches/1.8/phpgwapi/inc/functions.inc.php (original)
+++ branches/1.8/phpgwapi/inc/functions.inc.php Tue May 27 17:05:13 2014
@@ -21,7 +21,8 @@
 // Only variables should be assigned by reference, eg. soetemplate::tree_walk()
 // Declaration of <extended method> should be compatible with <parent method>, varios places where method parameters change
 // --> switching it off for now, as it makes error-log unusable
-error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+// disabling PHP 5.5 E_DEPRECATED messages eg. preg_replace with /e
+error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 if (function_exists('get_magic_quotes_runtime') && get_magic_quotes_runtime())
 {
 	set_magic_quotes_runtime(false);

Modified: branches/1.8/setup/inc/functions.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/1.8/setup/inc/functions.inc.php?rev=47106&r1=47105&r2=47106&view=diff
==============================================================================
--- branches/1.8/setup/inc/functions.inc.php (original)
+++ branches/1.8/setup/inc/functions.inc.php Tue May 27 17:05:13 2014
@@ -13,7 +13,8 @@
  * @version $Id$
  */
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT);
+// disabling PHP 5.5 E_DEPRECATED messages eg. preg_replace with /e
+error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 // for an old header, we need to setup the reference before including it
 $GLOBALS['phpgw_info'] =& $GLOBALS['egw_info'];