[phpwiki-checkins] SF.net SVN: phpwiki:[7286] trunk/lib

[<var...@us...>]

Revision: 7286
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7286&view=rev
Author:   vargenau
Date:     2010-01-22 14:06:31 +0000 (Fri, 22 Jan 2010)

Log Message:
-----------
Process log messages of type 'E_DEPRECATED' as warnings (for PHP 5.3 migration)

Modified Paths:
--------------
    trunk/lib/ErrorManager.php
    trunk/lib/main.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2010-01-22 13:58:31 UTC (rev 7285)
+++ trunk/lib/ErrorManager.php	2010-01-22 14:06:31 UTC (rev 7286)
@@ -12,9 +12,9 @@
     error_reporting(E_ALL & ~E_STRICT);
 }
 */
-define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048);
+define ('EM_FATAL_ERRORS', E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | ~2048 & ((check_php_version(5,3)) ? ~E_DEPRECATED : ~0));
 define ('EM_WARNING_ERRORS',
-	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING);
+	E_WARNING | E_CORE_WARNING | E_COMPILE_WARNING | E_USER_WARNING | ((check_php_version(5,3)) ? E_DEPRECATED : 0));
 define ('EM_NOTICE_ERRORS', E_NOTICE | E_USER_NOTICE);
 
 /* It is recommended to leave assertions on. 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-01-22 13:58:31 UTC (rev 7285)
+++ trunk/lib/main.php	2010-01-22 14:06:31 UTC (rev 7286)
@@ -2,6 +2,8 @@
 rcs_id('$Id$');
 /*
  * Copyright 1999-2008 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -1330,7 +1332,7 @@
     // Postpone warnings
     global $ErrorManager;
     if (defined('E_STRICT')) // and (E_ALL & E_STRICT)) // strict php5?
-        $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT);
+        $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING|E_STRICT|((check_php_version(5,3)) ? E_DEPRECATED : 0));
     else
         $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE|E_USER_WARNING|E_WARNING);
     $request = new WikiRequest();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.