X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=dfa8cf6f932551d1d3d12b991b4f06f99229e285;hb=97041a612ebe4ac76c25c9ca838541f8f89b9cfa;hp=4ad7344f3711cb2552bd34c551770732b8cdd0fe;hpb=6834ae7504a453ff4e9289d2146d373a6eb1d76e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 4ad7344f37..dfa8cf6f93 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -54,7 +54,7 @@ class WebRequest { * Cached URL protocol * @var string */ - private $protocol; + protected $protocol; public function __construct() { /// @todo FIXME: This preemptive de-quoting can interfere with other web libraries @@ -113,8 +113,8 @@ class WebRequest { $router->add( "$wgScript/$1" ); if ( isset( $_SERVER['SCRIPT_NAME'] ) - && preg_match( '/\.php5?/', $_SERVER['SCRIPT_NAME'] ) ) - { + && preg_match( '/\.php5?/', $_SERVER['SCRIPT_NAME'] ) + ) { # Check for SCRIPT_NAME, we handle index.php explicitly # But we do have some other .php files such as img_auth.php # Don't let root article paths clober the parsing for them @@ -1522,6 +1522,12 @@ class FauxRequest extends WebRequest { class DerivativeRequest extends FauxRequest { private $base; + /** + * @param WebRequest $base + * @param array $data Array of *non*-urlencoded key => value pairs, the + * fake GET/POST values + * @param bool $wasPosted Whether to treat the data as POST + */ public function __construct( WebRequest $base, $data, $wasPosted = false ) { $this->base = $base; parent::__construct( $data, $wasPosted );