r62141 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r62140‎ | r62141 | r62142 >
Date:22:05, 8 February 2010
Author:catrope
Status:ok
Tags:
Comment:
wmf-deployment: Merge r62140 (OptIn fix) from trunk
Modified paths:
  • /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn (modified) (history)
  • /branches/wmf-deployment/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn/SpecialOptIn.php
@@ -25,11 +25,11 @@
2626 return false;
2727
2828 foreach ( $wgOptInPrefs as $pref => $value ) {
29 - if ( $user->getOption( $pref ) != $value ) {
30 - return false;
 29+ if ( $pref != 'skin' && $user->getOption( $pref ) == $value ) {
 30+ return true;
3131 }
3232 }
33 - return true;
 33+ return false;
3434 }
3535
3636 public static function checkToken() {
Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/OptIn
___________________________________________________________________
Name: svn:mergeinfo
3737 + /branches/REL1_15/phase3/extensions/UsabilityInitiative/OptIn:51646
/trunk/extensions/UsabilityInitiative/OptIn:56207,56209,56296,56333,56355,62041,62043,62140
/trunk/phase3/extensions/UsabilityInitiative/OptIn:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r62140OptIn: Show "Leave Beta" link if a user has ANY feature enabled (rather than ...catrope22:01, 8 February 2010

Status & tagging log