From: Aaron Schulz Date: Sun, 3 Jun 2012 21:07:58 +0000 (+0000) Subject: Revert "Purge Squid variant pages based on page language (not $wgContLang)" per CR... X-Git-Tag: 1.31.0-rc.0~23198^2~4^2 X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=10c37d58fe91ba73572343a09ab5b576f11a7d1f;p=lhc%2Fweb%2Fwiklou.git Revert "Purge Squid variant pages based on page language (not $wgContLang)" per CR comments. I merged this one too quickly. This reverts commit 0f9b9d51443a7c2fa62deba0953ce69b388b7c76 --- diff --git a/includes/Title.php b/includes/Title.php index e6af0ba305..481f480c99 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -3284,14 +3284,16 @@ class Title { * @return Array of String the URLs */ public function getSquidURLs() { + global $wgContLang; + $urls = array( $this->getInternalURL(), $this->getInternalURL( 'action=history' ) ); - $pageLang = $this->getPageLanguage(); - if ( $pageLang->hasVariants() ) { - $variants = $pageLang->getVariants(); + // purge variant urls as well + if ( $wgContLang->hasVariants() ) { + $variants = $wgContLang->getVariants(); foreach ( $variants as $vCode ) { $urls[] = $this->getInternalURL( '', $vCode ); }