| Index: trunk/phase3/CREDITS |
| — | — | @@ -147,6 +147,7 @@ |
| 148 | 148 | * rgcjonas |
| 149 | 149 | * Robert Treat |
| 150 | 150 | * RockMFR |
| | 151 | +* Rusty Burchfield |
| 151 | 152 | * Salvatore Ingala |
| 152 | 153 | * Scott Colcord |
| 153 | 154 | * Simon Walker |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -356,12 +356,15 @@ |
| 357 | 357 | array(), |
| 358 | 358 | array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) ); |
| 359 | 359 | |
| | 360 | + $emailAddress = $user->getEmail() ? htmlspecialchars( $user->getEmail() ) : ''; |
| | 361 | + if ( $wgAuth->allowPropChange( 'emailaddress' ) ) { |
| | 362 | + $emailAddress .= $emailAddress == '' ? $link : " ($link)"; |
| | 363 | + } |
| | 364 | + |
| 360 | 365 | $defaultPreferences['emailaddress'] = array( |
| 361 | 366 | 'type' => 'info', |
| 362 | 367 | 'raw' => true, |
| 363 | | - 'default' => $user->getEmail() |
| 364 | | - ? htmlspecialchars( $user->getEmail() ) . " ($link)" |
| 365 | | - : $link, |
| | 368 | + 'default' => $emailAddress, |
| 366 | 369 | 'label-message' => 'youremail', |
| 367 | 370 | 'section' => 'personal/email', |
| 368 | 371 | ); |