explode()'ing the callback is no longer needed in AjaxDispatcher.
authorAlexandre Emsenhuber <ialex.wiki@gmail.com>
Tue, 17 Jul 2012 14:28:58 +0000 (16:28 +0200)
committerAlexandre Emsenhuber <ialex.wiki@gmail.com>
Tue, 17 Jul 2012 14:28:58 +0000 (16:28 +0200)
This is only needed in PHP<5.2.3, as we require PHP 5.3.2+,
this is no longer the case.

Change-Id: I6fa210a96f854d12d9713172a31ed5a71d3d4a69

includes/AjaxDispatcher.php

index e3df520..b457ea6 100644 (file)
@@ -113,7 +113,7 @@ class AjaxDispatcher {
                                'Bad Request',
                                "unknown function " . (string) $this->func_name
                        );
-               } elseif ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) 
+               } elseif ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true )
                        && !$wgUser->isAllowed( 'read' ) )
                {
                        wfHttpError(
@@ -123,14 +123,8 @@ class AjaxDispatcher {
                } else {
                        wfDebug( __METHOD__ . ' dispatching ' . $this->func_name . "\n" );
 
-                       if ( strpos( $this->func_name, '::' ) !== false ) {
-                               $func = explode( '::', $this->func_name, 2 );
-                       } else {
-                               $func = $this->func_name;
-                       }
-
                        try {
-                               $result = call_user_func_array( $func, $this->args );
+                               $result = call_user_func_array( $this->func_name, $this->args );
 
                                if ( $result === false || $result === null ) {
                                        wfDebug( __METHOD__ . ' ERROR while dispatching '