From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 8 Mar 2004 09:51:11 +0000 (+0000)
Subject: Consolidate with Title::getInternalURL() a bit
X-Git-Tag: 1.3.0beta1~832
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=f680d2a57439226a331de40c9183492c56d38e9a;p=lhc%2Fweb%2Fwiklou.git

Consolidate with Title::getInternalURL() a bit
---

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index a2e648030d..6ac9d340a8 100644
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -105,7 +105,7 @@ class MovePageForm {
 	{
 		global $wgOut, $wgUser, $wgLang;
 		global $wgDeferredUpdateList, $wgMessageCache;
-		global  $wgUseSquid, $wgInternalServer;
+		global  $wgUseSquid;
 		$fname = "MovePageForm::doSubmit";
 
 		$this->ot = Title::newFromText( $this->oldTitle );
@@ -169,9 +169,9 @@ class MovePageForm {
 			/* this needs to be done after LinksUpdate */
 			$urlArr = Array(				
 				# purge new title
-				$wgInternalServer.$this->nt->getLocalURL(),
+				$this->nt->getInternalURL(),
 				# purge old title
-				$wgInternalServer.$this->ot->getLocalURL(),
+				$this->ot->getInternalURL(),
 			);			
 			wfPurgeSquidServers($urlArr);	
 			# purge pages linking to new title
diff --git a/includes/SquidUpdate.php b/includes/SquidUpdate.php
index 743eea3c38..45e488314c 100644
--- a/includes/SquidUpdate.php
+++ b/includes/SquidUpdate.php
@@ -13,7 +13,6 @@ class SquidUpdate {
 	function doUpdate()
 	{
 		if (count( $this->urlArr ) == 0) { // newly created Article
-			global $wgInternalServer;
 			/* prepare the list of urls to purge */
 			$id= $this->title->getArticleID();
 			$sql = "SELECT l_from FROM links WHERE l_to={$id}" ;
@@ -21,7 +20,7 @@ class SquidUpdate {
 			while ( $BL = wfFetchObject ( $res ) )
 			{
 				$t = Title::newFromDBkey( $BL->l_from) ; 
-				$this->urlArr[] = $wgInternalServer.$t->getLocalURL() ;
+				$this->urlArr[] = $t->getInternalURL() ;
 			}
 			wfFreeResult ( $res ) ;