Merge "API: Pretty-printed responses should always use HTTP status 200"

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

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 6c2782c..0686578 100644 (file)
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -161,7 +161,7 @@ class AjaxResponse {
                        // For back-compat, it is supported that mResponseCode be a string like " 200 OK"
                        // (with leading space and the status message after). Cast response code to an integer
                        // to take advantage of PHP's conversion rules which will turn "  200 OK" into 200.
-                       // http://php.net/string#language.types.string.conversion
+                       // https://secure.php.net/manual/en/language.types.string.php#language.types.string.conversion
                        $n = intval( trim( $this->mResponseCode ) );
                        HttpStatus::header( $n );
                }
@@ -303,10 +303,10 @@ class AjaxResponse {
         */
        function storeInMemcached( $mckey, $expiry = 86400 ) {
                ObjectCache::getMainWANInstance()->set( $mckey,
-                       array(
+                       [
                                'timestamp' => wfTimestampNow(),
                                'value' => $this->mText
-                       ), $expiry
+                       ], $expiry
                );
 
                return true;