Consolidate with Title::getInternalURL() a bit

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index a2e6480..6ac9d34 100644 (file)
--- 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 743eea3..45e4883 100644 (file)
--- 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 ) ;