From: Kunal Mehta <legoktm@gmail.com>
Date: Sun, 3 Aug 2014 23:41:53 +0000 (-0700)
Subject: Use wfScript() instead of globals in a few places
X-Git-Tag: 1.31.0-rc.0~14605
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=a4a7f069b62a4332bc56c61a5c40b1447663055d;p=lhc%2Fweb%2Fwiklou.git

Use wfScript() instead of globals in a few places

Change-Id: I8a23e7b647c082119799b5bc8cfd5ff76c712f85
---

diff --git a/includes/specials/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php
index 4d9e7dad7f..3f1850d128 100644
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -105,8 +105,6 @@ class MIMEsearchPage extends QueryPage {
 	}
 
 	function execute( $par ) {
-		global $wgScript;
-
 		$mime = $par ? $par : $this->getRequest()->getText( 'mime' );
 		$mime = trim( $mime );
 
@@ -115,7 +113,7 @@ class MIMEsearchPage extends QueryPage {
 		$this->getOutput()->addHTML(
 			Xml::openElement(
 				'form',
-				array( 'id' => 'specialmimesearch', 'method' => 'get', 'action' => $wgScript )
+				array( 'id' => 'specialmimesearch', 'method' => 'get', 'action' => wfScript() )
 			) .
 				Xml::openElement( 'fieldset' ) .
 				Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() ) .
diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index e1700dee64..6efc12b391 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -159,14 +159,12 @@ class SpecialMergeHistory extends SpecialPage {
 	}
 
 	function showMergeForm() {
-		global $wgScript;
-
 		$this->getOutput()->addWikiMsg( 'mergehistory-header' );
 
 		$this->getOutput()->addHTML(
 			Xml::openElement( 'form', array(
 				'method' => 'get',
-				'action' => $wgScript ) ) .
+				'action' => wfScript() ) ) .
 				'<fieldset>' .
 				Xml::element( 'legend', array(),
 					$this->msg( 'mergehistory-box' )->text() ) .