Mwalker has uploaded a new change for review. https://gerrit.wikimedia.org/r/93604
Change subject: Merge remote-tracking branch 'gerrit/master' into wmf_deploy ...................................................................... Merge remote-tracking branch 'gerrit/master' into wmf_deploy * gerrit/master: Localisation updates from http://translatewiki.net. Localisation updates from http://translatewiki.net. Localisation updates from http://translatewiki.net. Serve Mobile URLs to Mobile Users Crosswiki Banner Hiding Revert "Serve Mobile URLs to Mobile Users" Localisation updates from http://translatewiki.net. Conflicts: CentralNotice.hooks.php Change-Id: Ifbe4acb423381e3ccbd1927d07bbf943efec1b3e --- M CentralNotice.hooks.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice refs/changes/04/93604/1 diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index 7144b50..7722bff 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -299,8 +299,6 @@ $wgCentralBannerRecorder = "{$wgScript}/{$wgContLang->specialPage( 'RecordImpression' )}"; } -<<<<<<< HEAD (1a03d0 Merge remote-tracking branch 'origin/master' into HEAD) -======= // Mangle infrastructure URLs for mobile use -- this should always be last. if ( class_exists( 'MobileContext' ) ) { // Where possible; make things mobile friendly @@ -319,11 +317,11 @@ $wgNoticeHideUrls = array_merge( $wgNoticeHideUrls, $mobileHides ); } ->>>>>>> BRANCH (2a7dca Localisation updates from http://translatewiki.net.) $vars[ 'wgNoticeFundraisingUrl' ] = $wgNoticeFundraisingUrl; $vars[ 'wgCentralPagePath' ] = $wgCentralPagePath; $vars[ 'wgCentralBannerDispatcher' ] = $wgCentralBannerDispatcher; $vars[ 'wgCentralBannerRecorder' ] = $wgCentralBannerRecorder; + $vars[ 'wgNoticeXXCountries' ] = $wgNoticeXXCountries; $vars[ 'wgNoticeNumberOfBuckets' ] = $wgNoticeNumberOfBuckets; $vars[ 'wgNoticeBucketExpiry' ] = $wgNoticeBucketExpiry; -- To view, visit https://gerrit.wikimedia.org/r/93604 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbe4acb423381e3ccbd1927d07bbf943efec1b3e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: wmf_deploy Gerrit-Owner: Mwalker <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
