From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 13 Mar 2012 07:39:33 +0000 (+0000)
Subject: * (bug 35152) Fix for r92924: help message for e-mail was removed from user preferences
X-Git-Tag: 1.31.0-rc.0~24277
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=8e5ba63af77a8e551cbcbdc2607eb1ea4c70b810;p=lhc%2Fweb%2Fwiklou.git

* (bug 35152) Fix for r92924: help message for e-mail was removed from user preferences
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 8378c8012d..8fbf117515 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -15,6 +15,7 @@ production.
 * (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.
diff --git a/includes/Preferences.php b/includes/Preferences.php
index c021b268c9..a9f7456052 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -361,6 +361,7 @@ class Preferences {
 				'default' => $emailAddress,
 				'label-message' => 'youremail',
 				'section' => 'personal/email',
+				'help-messages' => $helpMessages,
 				# 'cssclass' chosen below
 			);