Merge pull request #1670 from okonomiyaki3000/JForm-change-xpath

JForm::findFieldsByFieldset
joomla · Nov 9, 2012 · 3d21b02 · 3d21b02
2 parents 20bb5ce + c334a43
commit 3d21b02
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libraries/joomla/form/form.php b/libraries/joomla/form/form.php
@@ -1489,10 +1489,11 @@ protected function &findFieldsByFieldset($name)
 
 		/*
 		 * Get an array of <field /> elements that are underneath a <fieldset /> element
-		 * with the appropriate name attribute, and also any <field /> elements with
-		 * the appropriate fieldset attribute.
+		 * with the appropriate name attribute (unless they are the decendents
+		 * of another <field /> element for some reaon), and also any <field /> elements
+		 * with the appropriate fieldset attribute.
 		 */
-		$fields = $this->xml->xpath('//fieldset[@name="' . $name . '"]//field | //field[@fieldset="' . $name . '"]');
+		$fields = $this->xml->xpath('//fieldset[@name="' . $name . '"]//field[not(ancestor::field)] | //field[@fieldset="' . $name . '"]');
 
 		return $fields;
 	}