| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -86,6 +86,8 @@ |
| 87 | 87 | * (bug 29101) Special:FileDuplicateSearch shows silly message |
| 88 | 88 | * (bug 29048) jQuery.tabIndex: firstTabIndex() should not output the same |
| 89 | 89 | as lastTabIndex(). |
| | 90 | +* (bug 29332) Warn if user requests mediawiki-announce subscription but does not |
| | 91 | + enter an e-mail address. |
| 90 | 92 | |
| 91 | 93 | === API changes in 1.19 === |
| 92 | 94 | * BREAKING CHANGE: action=watch now requires POST and token. |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -758,6 +758,12 @@ |
| 759 | 759 | $this->parent->showError( 'config-admin-error-bademail' ); |
| 760 | 760 | $retVal = false; |
| 761 | 761 | } |
| | 762 | + // If they asked to subscribe to mediawiki-announce but didn't give |
| | 763 | + // an e-mail, show an error. Bug 29332 |
| | 764 | + if( !$email && $this->getVar( '_Subscribe' ) ) { |
| | 765 | + $this->parent->showError( 'config-subscribe-noemail' ); |
| | 766 | + $retVal = false; |
| | 767 | + } |
| 762 | 768 | |
| 763 | 769 | return $retVal; |
| 764 | 770 | } |
| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -373,6 +373,8 @@ |
| 374 | 374 | 'config-subscribe' => 'Subscribe to the [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce release announcements mailing list].', |
| 375 | 375 | 'config-subscribe-help' => 'This is a low-volume mailing list used for release announcements, including important security announcements. |
| 376 | 376 | You should subscribe to it and update your MediaWiki installation when new versions come out.', |
| | 377 | + 'config-subscribe-noemail' => 'You tried to subscribe to the release announcements mailing list without providing an e-mail address. |
| | 378 | +Please provide an e-mail address if you wish to subscribe to the mailing list.', |
| 377 | 379 | 'config-almost-done' => 'You are almost done! |
| 378 | 380 | You can now skip the remaining configuration and install the wiki right now.', |
| 379 | 381 | 'config-optional-continue' => 'Ask me more questions.', |