From: Antoine Musso <hashar@users.mediawiki.org>
Date: Wed, 18 May 2011 20:33:47 +0000 (+0000)
Subject: use string as callback when possible (since PHP 5.2.3)
X-Git-Tag: 1.31.0-rc.0~30083
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=9787dea7a20199f242199c5a12ff41cb3123589b;p=lhc%2Fweb%2Fwiklou.git

use string as callback when possible (since PHP 5.2.3)
---

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3f05268430..9fd5954394 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -229,7 +229,7 @@ class Hooks {
 			 * problem here.
 			 */
 			$retval = null;
-			set_error_handler( array( 'Hooks', 'hookErrorHandler' ) );
+			set_error_handler( 'Hooks::hookErrorHandler' );
 			wfProfileIn( $func );
 			try {
 				$retval = call_user_func_array( $callback, $hook_args );
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fd91d5b269..b33c2a6c23 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -219,7 +219,7 @@ class UserMailer {
 			self::$mErrorString = '';
 			$html_errors = ini_get( 'html_errors' );
 			ini_set( 'html_errors', '0' );
-			set_error_handler( array( 'UserMailer', 'errorHandler' ) );
+			set_error_handler( 'UserMailer::errorHandler' );
 
 			if ( !is_array( $to ) ) {
 				$to = array( $to );