use string as callback when possible (since PHP 5.2.3)

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3f05268..9fd5954 100644 (file)
--- 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 fd91d5b..b33c2a6 100644 (file)
--- 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 );