HTMLForm: Add option to output a title for a fieldset & activate it for Special:Pref. Preliminary work for Bug 29672

2 files changed, 12 insertions, 2 deletions

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index f560590635ec..c73d536185b8 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -676,7 +676,7 @@ class HTMLForm {
 	 * TODO: Document
 	 * @param $fields
 	 */
-	function displaySection( $fields, $sectionName = '' ) {
+	function displaySection( $fields, $sectionName = '', $displayTitle = false ) {
 		$tableHtml = '';
 		$subsectionHtml = '';
 		$hasLeftColumn = false;
@@ -699,7 +699,11 @@ class HTMLForm {
 				if ( isset( $this->mSectionFooters[$key] ) ) {
 					$section .= $this->mSectionFooters[$key];
 				}
-				$subsectionHtml .= Xml::fieldset( $legend, $section ) . "\n";
+				$attributes = array();
+				if ( $displayTitle ) { 
+					$attributes["title"] = $key; 
+				}
+				$subsectionHtml .= Xml::fieldset( $legend, $section, $attributes ) . "\n";
 			}
 		}
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index b1274d182604..e36117a3ee86 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1520,4 +1520,10 @@ class PreferencesForm extends HTMLForm {
 
 		return $data;
 	}
+	/**
+	 * Get the whole body of the form.
+	 */
+	function getBody() {
+		return $this->displaySection( $this->mFieldTree, '', true );
+	}
 }