From 9787dea7a20199f242199c5a12ff41cb3123589b Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Wed, 18 May 2011 20:33:47 +0000 Subject: [PATCH] use string as callback when possible (since PHP 5.2.3) --- includes/Hooks.php | 2 +- includes/UserMailer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ); -- 2.20.1