http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89814
Revision: 89814
Author: demon
Date: 2011-06-10 03:27:37 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
(bug 29332) don't let install progress if user requests mediawiki-announce
subscription but does not enter email. Thanks Sumana :)
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/installer/Installer.i18n.php
trunk/phase3/includes/installer/WebInstallerPage.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-06-10 02:58:46 UTC (rev 89813)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-06-10 03:27:37 UTC (rev 89814)
@@ -86,6 +86,8 @@
* (bug 29101) Special:FileDuplicateSearch shows silly message
* (bug 29048) jQuery.tabIndex: firstTabIndex() should not output the same
as lastTabIndex().
+* (bug 29332) Warn if user requests mediawiki-announce subscription but does
not
+ enter an e-mail address.
=== API changes in 1.19 ===
* BREAKING CHANGE: action=watch now requires POST and token.
Modified: trunk/phase3/includes/installer/Installer.i18n.php
===================================================================
--- trunk/phase3/includes/installer/Installer.i18n.php 2011-06-10 02:58:46 UTC
(rev 89813)
+++ trunk/phase3/includes/installer/Installer.i18n.php 2011-06-10 03:27:37 UTC
(rev 89814)
@@ -373,6 +373,8 @@
'config-subscribe' => 'Subscribe to the
[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce release
announcements mailing list].',
'config-subscribe-help' => 'This is a low-volume mailing list
used for release announcements, including important security announcements.
You should subscribe to it and update your MediaWiki installation when new
versions come out.',
+ 'config-subscribe-noemail' => 'You tried to subscribe to the
release announcements mailing list without providing an e-mail address.
+Please provide an e-mail address if you wish to subscribe to the mailing
list.',
'config-almost-done' => 'You are almost done!
You can now skip the remaining configuration and install the wiki right now.',
'config-optional-continue' => 'Ask me more questions.',
Modified: trunk/phase3/includes/installer/WebInstallerPage.php
===================================================================
--- trunk/phase3/includes/installer/WebInstallerPage.php 2011-06-10
02:58:46 UTC (rev 89813)
+++ trunk/phase3/includes/installer/WebInstallerPage.php 2011-06-10
03:27:37 UTC (rev 89814)
@@ -758,6 +758,12 @@
$this->parent->showError( 'config-admin-error-bademail'
);
$retVal = false;
}
+ // If they asked to subscribe to mediawiki-announce but didn't
give
+ // an e-mail, show an error. Bug 29332
+ if( !$email && $this->getVar( '_Subscribe' ) ) {
+ $this->parent->showError( 'config-subscribe-noemail' );
+ $retVal = false;
+ }
return $retVal;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
