Merge "mw.Upload.BookletLayout: Require non-whitespace description"

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

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index bd80c79..23eb63b 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -965,8 +965,7 @@ class WebRequest {
         * @return bool
         */
        public function checkUrlExtension( $extWhitelist = array() ) {
-               global $wgScriptExtension;
-               $extWhitelist[] = ltrim( $wgScriptExtension, '.' );
+               $extWhitelist[] = 'php';
                if ( IEUrlExtension::areServerVarsBad( $_SERVER, $extWhitelist ) ) {
                        if ( !$this->wasPosted() ) {
                                $newUrl = IEUrlExtension::fixUrlForIE6(
@@ -1298,10 +1297,17 @@ class FauxRequest extends WebRequest {
                return false;
        }
 
+       /**
+        * @since 1.25
+        */
        public function setRequestURL( $url ) {
                $this->requestUrl = $url;
        }
 
+       /**
+        * @since 1.25 MWException( "getRequestURL not implemented" )
+        * no longer thrown.
+        */
        public function getRequestURL() {
                if ( $this->requestUrl === null ) {
                        throw new MWException( 'Request URL not set' );