From: Antoine Musso <hashar@users.mediawiki.org>
Date: Fri, 14 Jan 2011 20:43:30 +0000 (+0000)
Subject: Remove debugging issue in user preferences
X-Git-Tag: 1.31.0-rc.0~32540
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=811ff45c33dc1a1f75efc63abeb8983451b2a2a9;p=lhc%2Fweb%2Fwiklou.git

Remove debugging issue in user preferences

'tototo' message key does not exist that made the message dropped.
Could have used null as a value but it looks nicer to just set
the value.

Per CR on r80281
---

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 28ad9d371f..77f9d3d017 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -330,9 +330,11 @@ class Preferences {
 			$helpMessages[] = $wgEmailConfirmToEdit
 					? 'prefs-help-email-required'
 					: 'prefs-help-email' ;
-			$helpMessages[] = $wgEnableUserEmail
-					? 'prefs-help-email-others'
-					: 'tototo' ;
+
+			if( $wgEnableUserEmail ) {
+				// additional messages when users can send email to each other
+				$helpMessages[] = 'prefs-help-email-others';
+			}
 
 			$defaultPreferences['emailaddress'] = array(
 				'type' => $wgAuth->allowPropChange( 'emailaddress' ) ? 'email' : 'info',