https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113710
Revision: 113710
Author: ialex
Date: 2012-03-13 07:39:33 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
* (bug 35152) Fix for r92924: help message for e-mail was removed from user
preferences
Modified Paths:
--------------
branches/REL1_19/phase3/RELEASE-NOTES-1.19
branches/REL1_19/phase3/includes/Preferences.php
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/Preferences.php
Modified: branches/REL1_19/phase3/RELEASE-NOTES-1.19
===================================================================
--- branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-13 06:32:41 UTC (rev
113709)
+++ branches/REL1_19/phase3/RELEASE-NOTES-1.19 2012-03-13 07:39:33 UTC (rev
113710)
@@ -15,6 +15,7 @@
* (bug 35014) Including a special page no longer sets the page's title to the
included page
* (bug 35019) Edit summaries are no longer transformed in notification e-mails
+* (bug 35152) Help message for e-mail is shown again in user preferences
=== Configuration changes in 1.19 ===
* Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
Modified: branches/REL1_19/phase3/includes/Preferences.php
===================================================================
--- branches/REL1_19/phase3/includes/Preferences.php 2012-03-13 06:32:41 UTC
(rev 113709)
+++ branches/REL1_19/phase3/includes/Preferences.php 2012-03-13 07:39:33 UTC
(rev 113710)
@@ -360,6 +360,7 @@
'default' => $emailAddress,
'label-message' => 'youremail',
'section' => 'personal/email',
+ 'help-messages' => $helpMessages,
);
$disableEmailPrefs = false;
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2012-03-13 06:32:41 UTC (rev 113709)
+++ trunk/phase3/RELEASE-NOTES-1.19 2012-03-13 07:39:33 UTC (rev 113710)
@@ -15,6 +15,7 @@
* (bug 35014) Including a special page no longer sets the page's title to the
included page
* (bug 35019) Edit summaries are no longer transformed in notification e-mails
+* (bug 35152) Help message for e-mail is shown again in user preferences
=== Configuration changes in 1.19 ===
* Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2012-03-13 06:32:41 UTC (rev
113709)
+++ trunk/phase3/includes/Preferences.php 2012-03-13 07:39:33 UTC (rev
113710)
@@ -361,6 +361,7 @@
'default' => $emailAddress,
'label-message' => 'youremail',
'section' => 'personal/email',
+ 'help-messages' => $helpMessages,
# 'cssclass' chosen below
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
