| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php |
| — | — | @@ -85,7 +85,9 @@ |
| 86 | 86 | $globalUser->getName(), |
| 87 | 87 | true |
| 88 | 88 | ); |
| 89 | | - self::switchOffUser( $remoteUser ); |
| | 89 | + if ( $remoteUser ) { |
| | 90 | + self::switchOffUser( $remoteUser ); |
| | 91 | + } |
| 90 | 92 | } |
| 91 | 93 | } |
| 92 | 94 | } |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 93 | 95 | Merged /trunk/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php:r56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66331-66335,66337-68736,68742-68841,68843-69725,70633,72043,72149 |
| 94 | 96 | Merged /trunk/phase3/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php:r56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816 |
| 95 | 97 | Merged /branches/wmf-deployment/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php:r60970 |
| 96 | 98 | Merged /branches/REL1_15/phase3/extensions/UsabilityInitiative/PrefSwitch/SpecialPrefSwitch.php:r51646 |