Merge "Fix form submission on Special:RandomInCategory"

[lhc/web/wiklou.git] / includes / AjaxDispatcher.php

diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index b457ea6..bddbeb3 100644 (file)
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -63,7 +63,7 @@ class AjaxDispatcher {
                        $this->mode = "post";
                }
 
-               switch( $this->mode ) {
+               switch ( $this->mode ) {
                        case 'get':
                                $this->func_name = isset( $_GET["rs"] ) ? $_GET["rs"] : '';
                                if ( ! empty( $_GET["rsargs"] ) ) {
@@ -97,7 +97,7 @@ class AjaxDispatcher {
         * request.
         */
        function performAction() {
-               global $wgAjaxExportList, $wgOut, $wgUser;
+               global $wgAjaxExportList, $wgUser;
 
                if ( empty( $this->mode ) ) {
                        return;
@@ -113,13 +113,11 @@ class AjaxDispatcher {
                                'Bad Request',
                                "unknown function " . (string) $this->func_name
                        );
-               } elseif ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true )
-                       && !$wgUser->isAllowed( 'read' ) )
-               {
+               } elseif ( !User::isEveryoneAllowed( 'read' ) && !$wgUser->isAllowed( 'read' ) ) {
                        wfHttpError(
                                403,
                                'Forbidden',
-                               'You must log in to view pages.' );
+                               'You are not allowed to view pages.' );
                } else {
                        wfDebug( __METHOD__ . ' dispatching ' . $this->func_name . "\n" );
 
@@ -157,7 +155,6 @@ class AjaxDispatcher {
                        }
                }
 
-               $wgOut = null;
                wfProfileOut( __METHOD__ );
        }
 }