| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3545,7 +3545,8 @@ |
| 3546 | 3546 | return; |
| 3547 | 3547 | |
| 3548 | 3548 | foreach( $saveOptions as $key => $value ) { |
| 3549 | | - if ( is_null(self::getDefaultOption($key)) || |
| | 3549 | + if ( ( is_null(self::getDefaultOption($key)) && |
| | 3550 | + !( $value === false || is_null($value) ) ) || |
| 3550 | 3551 | $value != self::getDefaultOption( $key ) ) { |
| 3551 | 3552 | $insert_rows[] = array( |
| 3552 | 3553 | 'up_user' => $this->getId(), |
| Index: trunk/extensions/CentralAuth/CentralAuthUser.php |
| — | — | @@ -224,7 +224,8 @@ |
| 225 | 225 | |
| 226 | 226 | global $wgCentralAuthPropertySaveWhitelist; |
| 227 | 227 | foreach( $this->mProperties as $key => $value ) { |
| 228 | | - if ( is_null(User::getDefaultOption($key)) || |
| | 228 | + if ( ( is_null(User::getDefaultOption($key)) && |
| | 229 | + !( $value === false || is_null($value) ) ) || |
| 229 | 230 | $value != User::getDefaultOption( $key ) || |
| 230 | 231 | in_array( $key, $wgCentralAuthPropertySaveWhitelist ) ) { |
| 231 | 232 | $insert_rows[] = array( |