From 91e194556c52d2f354344f930419eef2dd6267f0 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 4 Sep 2013 05:51:59 +0200 Subject: Update to MediaWiki 1.21.2 --- includes/filerepo/file/LocalFile.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'includes/filerepo') diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php index 639228b9..4f50bfaa 100644 --- a/includes/filerepo/file/LocalFile.php +++ b/includes/filerepo/file/LocalFile.php @@ -1484,6 +1484,7 @@ class LocalFile extends File { * @return FileRepoStatus object. */ function delete( $reason, $suppress = false ) { + global $wgUseSquid; if ( $this->getRepo()->getReadOnlyReason() !== false ) { return $this->readOnlyFatalStatus(); } @@ -1506,6 +1507,15 @@ class LocalFile extends File { $this->purgeOldThumbnails( $archiveName ); } + if ( $wgUseSquid ) { + // Purge the squid + $purgeUrls = array(); + foreach ($archiveNames as $archiveName ) { + $purgeUrls[] = $this->getArchiveUrl( $archiveName ); + } + SquidUpdate::purge( $purgeUrls ); + } + return $status; } @@ -1524,6 +1534,7 @@ class LocalFile extends File { * @return FileRepoStatus object. */ function deleteOld( $archiveName, $reason, $suppress = false ) { + global $wgUseSquid; if ( $this->getRepo()->getReadOnlyReason() !== false ) { return $this->readOnlyFatalStatus(); } @@ -1541,6 +1552,11 @@ class LocalFile extends File { $this->purgeHistory(); } + if ( $wgUseSquid ) { + // Purge the squid + SquidUpdate::purge( array( $this->getArchiveUrl( $archiveName ) ) ); + } + return $status; } -- cgit v1.2.2