r76552 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76551‎ | r76552 | r76553 >
Date:00:25, 12 November 2010
Author:tomasz
Status:ok
Tags:
Comment:
Merging in r76551
Modified paths:
  • /branches/wmf/1.16wmf4/extensions/LandingCheck (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/LandingCheck/LandingCheck.php (modified) (history)
  • /branches/wmf/1.16wmf4/extensions/LandingCheck/SpecialLandingCheck.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/extensions/LandingCheck/LandingCheck.php
@@ -21,7 +21,7 @@
2222
2323 // If there are any countries for which the country page should be the fallback rather than a
2424 // language page, add its country code to this array.
25 -$priorityCountries = array();
 25+$wgPriorityCountries = array();
2626
2727 $dir = dirname( __FILE__ ) . '/';
2828
Index: branches/wmf/1.16wmf4/extensions/LandingCheck/SpecialLandingCheck.php
@@ -17,7 +17,7 @@
1818 }
1919
2020 public function execute( $sub ) {
21 - global $wgOut, $wgRequest, $priorityCountries;
 21+ global $wgOut, $wgRequest, $wgPriorityCountries;
2222
2323 // Pull in query string parameters
2424 $language = $wgRequest->getVal( 'language', 'en' );
@@ -32,7 +32,7 @@
3333 'referrer' => $wgRequest->getHeader( 'referer' )
3434 ) );
3535
36 - if ( in_array( $country, $priorityCountries ) ) {
 36+ if ( in_array( $country, $wgPriorityCountries ) ) {
3737 // Build array of landing pages to check for
3838 $targetTexts = array(
3939 $landingPage . '/' . $country . '/' . $language,
Property changes on: branches/wmf/1.16wmf4/extensions/LandingCheck
___________________________________________________________________
Added: svn:mergeinfo
4040 Merged /branches/wmf-deployment/extensions/LandingCheck:r60970
4141 Merged /trunk/extensions/LandingCheck:r76551
4242 Merged /trunk/phase3/extensions/LandingCheck:r63545-63546,63549,63643,63764,63897-63901,64113,64509,65387,65391,65555,65590,65650,65816,70559,71970,75332,75481

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r76551fixing global varkaldari00:14, 12 November 2010

Status & tagging log