https://www.mediawiki.org/wiki/Special:Code/MediaWiki/105453
Revision: 105453 Author: krinkle Date: 2011-12-07 19:23:10 +0000 (Wed, 07 Dec 2011) Log Message: ----------- [HarvardResearch] Disable by default. Also, static mw.config demo is now on: https://test.wikipedia.org/w/index.php?title=Special:NoticeTemplate/view&template=Harvard_prototype Modified Paths: -------------- trunk/extensions/CentralNotice/CentralNotice.php Modified: trunk/extensions/CentralNotice/CentralNotice.php =================================================================== --- trunk/extensions/CentralNotice/CentralNotice.php 2011-12-07 19:17:15 UTC (rev 105452) +++ trunk/extensions/CentralNotice/CentralNotice.php 2011-12-07 19:23:10 UTC (rev 105453) @@ -94,8 +94,11 @@ 'scripts' => 'bannerstats.js', ); -// Temporary setting to configure salt for Harvard banner protocol -$wgNoticeBanner_Harvard2011_salt = 'default'; +// Temporary setting to enable and configure info for Harvard banner on en.wikipedia.org +$wgNoticeBanner_Harvard2011 = array( + 'enable' => false, + 'salt' => 'default', +); /** * UnitTestsList hook handler @@ -247,7 +250,7 @@ */ function efCentralNoticeDefaults( &$vars ) { // Using global $wgUser for compatibility with 1.18 - global $wgNoticeProject, $wgUser, $wgMemc; + global $wgNoticeProject, $wgUser, $wgMemc, $wgNoticeBanner_Harvard2011, $wgContLang; // Initialize global Javascript variables. We initialize Geo with empty values so if the geo // IP lookup fails we don't have any surprises. @@ -258,7 +261,7 @@ // XXX: Temporary WMF-specific code for the 2011 Harvard survey invitation banner. // Only do this for logged-in users, keeping anonymous user output equal (for Squid-cache). // Also, don't run if the UserDailyContribs-extension isn't installed. - if ( $wgUser->isLoggedIn() && function_exists( 'getUserEditCountSince' ) ) { + if ( $wgNoticeBanner_Harvard2011['enable'] && $wgUser->isLoggedIn() && function_exists( 'getUserEditCountSince' ) ) { $cacheKey = wfMemcKey( 'CentralNotice', 'Harvard2011', 'v1', $wgUser->getId() ); $value = $wgMemc->get( $cacheKey ); @@ -278,13 +281,12 @@ $value = false; } else { - global $wgNoticeBanner_Harvard2011_salt, $wgContLang; $launchTimestamp = wfTimestamp( TS_UNIX, '2011-12-08 00:00:00' ); $groups = $wgUser->getGroups(); $registrationDate = $wgUser->getRegistration() ? $wgUser->getRegistration() : 0; $daysOld = floor( ( $launchTimestamp - wfTimestamp( TS_UNIX, $registrationDate ) ) / ( 60*60*24 ) ); - $salt = $wgNoticeBanner_Harvard2011_salt; + $salt = $wgNoticeBanner_Harvard2011['salt']; // Variables $hashData = array( _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
