From bc61dc4d96db0ea073d5e0d3cc50078737682df3 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 17 Jul 2012 16:28:58 +0200 Subject: [PATCH] explode()'ing the callback is no longer needed in AjaxDispatcher. 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 | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php index e3df520766..b457ea6eb0 100644 --- a/includes/AjaxDispatcher.php +++ b/includes/AjaxDispatcher.php @@ -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 ' -- 2.20.1