Merge "Revert "Use display name in category page subheadings if provided""

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

diff --git a/includes/AjaxDispatcher.php b/includes/AjaxDispatcher.php
index dde8467..d444a27 100644 (file)
--- a/includes/AjaxDispatcher.php
+++ b/includes/AjaxDispatcher.php
@@ -47,11 +47,16 @@ class AjaxDispatcher {
         */
        private $args;
 
+       /**
+        * @var Config
+        */
+       private $config;
+
        /**
         * Load up our object with user supplied data
         */
-       function __construct() {
-               wfProfileIn( __METHOD__ );
+       function __construct( Config $config ) {
+               $this->config = $config;
 
                $this->mode = "";
 
@@ -69,7 +74,7 @@ class AjaxDispatcher {
                                if ( !empty( $_GET["rsargs"] ) ) {
                                        $this->args = $_GET["rsargs"];
                                } else {
-                                       $this->args = array();
+                                       $this->args = [];
                                }
                                break;
                        case 'post':
@@ -77,17 +82,14 @@ class AjaxDispatcher {
                                if ( !empty( $_POST["rsargs"] ) ) {
                                        $this->args = $_POST["rsargs"];
                                } else {
-                                       $this->args = array();
+                                       $this->args = [];
                                }
                                break;
                        default:
-                               wfProfileOut( __METHOD__ );
                                return;
                                # Or we could throw an exception:
                                # throw new MWException( __METHOD__ . ' called without any data (mode empty).' );
                }
-
-               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -95,39 +97,35 @@ class AjaxDispatcher {
         * BEWARE! Data are passed as they have been supplied by the user,
         * they should be carefully handled in the function processing the
         * request.
+        *
+        * @param User $user
         */
-       function performAction() {
-               global $wgAjaxExportList, $wgUser;
-
+       function performAction( User $user ) {
                if ( empty( $this->mode ) ) {
                        return;
                }
 
-               wfProfileIn( __METHOD__ );
-
-               if ( !in_array( $this->func_name, $wgAjaxExportList ) ) {
+               if ( !in_array( $this->func_name, $this->config->get( 'AjaxExportList' ) ) ) {
                        wfDebug( __METHOD__ . ' Bad Request for unknown function ' . $this->func_name . "\n" );
-
                        wfHttpError(
                                400,
                                'Bad Request',
                                "unknown function " . $this->func_name
                        );
-               } elseif ( !User::isEveryoneAllowed( 'read' ) && !$wgUser->isAllowed( 'read' ) ) {
+               } elseif ( !User::isEveryoneAllowed( 'read' ) && !$user->isAllowed( 'read' ) ) {
                        wfHttpError(
                                403,
                                'Forbidden',
                                'You are not allowed to view pages.' );
                } else {
                        wfDebug( __METHOD__ . ' dispatching ' . $this->func_name . "\n" );
-
                        try {
                                $result = call_user_func_array( $this->func_name, $this->args );
 
                                if ( $result === false || $result === null ) {
-                                       wfDebug( __METHOD__ . ' ERROR while dispatching '
-                                                       . $this->func_name . "(" . var_export( $this->args, true ) . "): "
-                                                       . "no data returned\n" );
+                                       wfDebug( __METHOD__ . ' ERROR while dispatching ' .
+                                               $this->func_name . "(" . var_export( $this->args, true ) . "): " .
+                                               "no data returned\n" );
 
                                        wfHttpError( 500, 'Internal Error',
                                                "{$this->func_name} returned no data" );
@@ -136,15 +134,18 @@ class AjaxDispatcher {
                                                $result = new AjaxResponse( $result );
                                        }
 
+                                       // Make sure DB commit succeeds before sending a response
+                                       wfGetLBFactory()->commitMasterChanges( __METHOD__ );
+
                                        $result->sendHeaders();
                                        $result->printText();
 
                                        wfDebug( __METHOD__ . ' dispatch complete for ' . $this->func_name . "\n" );
                                }
                        } catch ( Exception $e ) {
-                               wfDebug( __METHOD__ . ' ERROR while dispatching '
-                                               . $this->func_name . "(" . var_export( $this->args, true ) . "): "
-                                               . get_class( $e ) . ": " . $e->getMessage() . "\n" );
+                               wfDebug( __METHOD__ . ' ERROR while dispatching ' .
+                                       $this->func_name . "(" . var_export( $this->args, true ) . "): " .
+                                       get_class( $e ) . ": " . $e->getMessage() . "\n" );
 
                                if ( !headers_sent() ) {
                                        wfHttpError( 500, 'Internal Error',
@@ -154,7 +155,5 @@ class AjaxDispatcher {
                                }
                        }
                }
-
-               wfProfileOut( __METHOD__ );
        }
 }