From e1df8ec2fcb38dd5136e59fb4348a45ba80a8f6d Mon Sep 17 00:00:00 2001
From: Christopher Pitt <cgpitt@gmail.com>
Date: Tue, 28 Apr 2015 09:12:32 +1200
Subject: [PATCH] Clean up LabelField

---
 forms/LabelField.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/forms/LabelField.php b/forms/LabelField.php
index 367db19d5..8f4a69518 100644
--- a/forms/LabelField.php
+++ b/forms/LabelField.php
@@ -1,30 +1,34 @@
 <?php
+
 /**
- * Simple label tag. This can be used to add extra text in your forms.
- * Consider using a {@link ReadonlyField} if you need to display a label
- * AND a value.
- * 
+ * Simple label, to add extra text in your forms.
+ *
+ * Use a {@link ReadonlyField} if you need to display a label and value.
+ *
  * @package forms
  * @subpackage fields-dataless
  */
 class LabelField extends DatalessField {
-	
 	/**
 	 * @param string $name
-	 * @param string $title
-	 * @param Form $form
+	 * @param null|string $title
 	 */
-	public function __construct($name, $title) {
-		// legacy handling for old parameters: $title, $heading, ...
-		// instead of new handling: $name, $title, $heading, ...
+	public function __construct($name, $title = null) {
+		// legacy handling:
+		// $title, $headingLevel...
 		$args = func_get_args();
+
 		if(!isset($args[1])) {
 			$title = (isset($args[0])) ? $args[0] : null;
-			$name = $title;
-			$form = (isset($args[3])) ? $args[3] : null;
-		} 
-		
+
+			if(isset($args[0])) {
+				$title = $args[0];
+			}
+
+			// Prefix name to avoid collisions.
+			$name = 'LabelField' . $title;
+		}
+
 		parent::__construct($name, $title);
 	}
-
 }