From cb1a2956e8f59e33bdf0389a053a2df449a559b7 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 27 Aug 2009 14:15:02 +0000
Subject: [PATCH] * (bug 20404) Custom fields in the user creation form
 template can now have tooltips

---
 CREDITS                          | 1 +
 RELEASE-NOTES                    | 2 ++
 includes/templates/Userlogin.php | 8 +++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 714d6cdb87..86034bdd64 100644
--- a/CREDITS
+++ b/CREDITS
@@ -85,6 +85,7 @@ following names for their contribution to the product.
 * Matěj Grabovský
 * mati
 * Max Semenik
+* Max Sikström
 * Michael De La Rue
 * Michael Walsh
 * Mike Horvath
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1648f6477e..fb7ebb9d98 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -195,6 +195,8 @@ this. Was used when mwEmbed was going to be an extension.
   criteria used by Special:Random and subclasses, or substitute a custom result,
   deprecating the $wgExtraRandompageSQL config variable
 * (bug 20318) Distinct CSS classes for ISBN/RFC/PMID special links added
+* (bug 20404) Custom fields in the user creation form template can now have
+  tooltips
 
 === Bug fixes in 1.16 ===
 
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 914e773cfb..ddf4bdacbb 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -123,12 +123,13 @@ class UserloginTemplate extends QuickTemplate {
  * @ingroup Templates
  */
 class UsercreateTemplate extends QuickTemplate {
-	function addInputItem( $name, $value, $type, $msg ) {
+	function addInputItem( $name, $value, $type, $msg, $helptext = false ) {
 		$this->data['extraInput'][] = array(
 			'name' => $name,
 			'value' => $value,
 			'type' => $type,
 			'msg' => $msg,
+			'helptext' => $helptext,
 		);
 	}
 	
@@ -285,7 +286,12 @@ class UsercreateTemplate extends QuickTemplate {
 				<label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"><?php
 					$this->msgHtml( $inputItem['msg'] ) ?></label><?php
 					}
+				if( $inputItem['helptext'] !== false ) {
 				?>
+				<div class="prefsectiontip">
+					<?php $this->msgWiki( $inputItem['helptext'] ); ?>
+				</div>
+				<?php } ?>
 			</td>
 		</tr>
 <?php				
-- 
2.20.1