Merge "Do not return anything on __construct"

[lhc/web/wiklou.git] / includes / specials / SpecialContributions.php

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 251ac51..af8ab58 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -163,7 +163,7 @@ class SpecialContributions extends IncludableSpecialPage {
                }
 
                if ( $feedType ) {
-                       // Maintain some level of backwards compatability
+                       // Maintain some level of backwards compatibility
                        // If people request feeds using the old parameters, redirect to API
                        $feedParams['feedformat'] = $feedType;
                        $url = wfAppendQuery( wfScript( 'api' ), $feedParams );
@@ -255,6 +255,9 @@ class SpecialContributions extends IncludableSpecialPage {
                                                wfEscapeWikiText( $userObj->getName() ),
                                        )
                                );
+                               if ( !$this->including() ) {
+                                       $this->getOutput()->setStatusCode( 404 );
+                               }
                        }
                        $user = htmlspecialchars( $userObj->getName() );
                } else {
@@ -393,8 +396,6 @@ class SpecialContributions extends IncludableSpecialPage {
         * @return string HTML fragment
         */
        protected function getForm() {
-               global $wgScript;
-
                $this->opts['title'] = $this->getPageTitle()->getPrefixedText();
                if ( !isset( $this->opts['target'] ) ) {
                        $this->opts['target'] = '';
@@ -446,7 +447,7 @@ class SpecialContributions extends IncludableSpecialPage {
                        'form',
                        array(
                                'method' => 'get',
-                               'action' => $wgScript,
+                               'action' => wfScript(),
                                'class' => 'mw-contributions-form'
                        )
                );