Merge "Fix the (un)watch token to include the namespace name."

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

diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index b6c9d55..fc26c90 100644 (file)
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -59,7 +59,7 @@ class FileDuplicateSearchPage extends QueryPage {
        /**
         * Fetch dupes from all connected file repositories.
         *
-        * @return array of File objects
+        * @return array Array of File objects
         */
        function getDupes() {
                return RepoGroup::singleton()->findBySha1( $this->hash );
@@ -67,7 +67,7 @@ class FileDuplicateSearchPage extends QueryPage {
 
        /**
         *
-        * @param array $dupes of File objects
+        * @param array $dupes Array of File objects
         */
        function showList( $dupes ) {
                $html = array();
@@ -96,8 +96,6 @@ class FileDuplicateSearchPage extends QueryPage {
        }
 
        function execute( $par ) {
-               global $wgScript;
-
                $this->setHeaders();
                $this->outputHeader();
 
@@ -115,7 +113,7 @@ class FileDuplicateSearchPage extends QueryPage {
                $out->addHTML(
                        Html::openElement(
                                'form',
-                               array( 'id' => 'fileduplicatesearch', 'method' => 'get', 'action' => $wgScript )
+                               array( 'id' => 'fileduplicatesearch', 'method' => 'get', 'action' => wfScript() )
                        ) . "\n" .
                                Html::hidden( 'title', $this->getPageTitle()->getPrefixedDBkey() ) . "\n" .
                                Html::openElement( 'fieldset' ) . "\n" .