* (bug 6074) Correct squid purging of offsite upload URLs

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 840dc8e..d926481 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -480,7 +480,7 @@ END
        }
 
        function doDelete()     {
-               global $wgOut, $wgRequest, $wgUseSquid, $wgInternalServer;
+               global $wgOut, $wgRequest, $wgUseSquid;
                global $wgPostCommitUpdateList;
 
                $fname = 'ImagePage::doDelete';
@@ -506,7 +506,7 @@ END
                        # Squid purging
                        if ( $wgUseSquid ) {
                                $urlArr = array(
-                                       $wgInternalServer.wfImageArchiveUrl( $oldimage ),
+                                       wfImageArchiveUrl( $oldimage ),
                                        $this->mTitle->getInternalURL()
                                );
                                wfPurgeSquidServers($urlArr);
@@ -542,7 +542,7 @@ END
                        $urlArr = Array();
                        while ( $s = $dbw->fetchObject( $res ) ) {
                                $this->doDeleteOldImage( $s->oi_archive_name );
-                               $urlArr[] = $wgInternalServer.wfImageArchiveUrl( $s->oi_archive_name );
+                               $urlArr[] = wfImageArchiveUrl( $s->oi_archive_name );
                        }
 
                        # And also the HTML of all pages using this image