diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Form/Element/Radio.php --- a/web/lib/Zend/Form/Element/Radio.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Form/Element/Radio.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,9 +28,9 @@ * @category Zend * @package Zend_Form * @subpackage Element - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Radio.php 22328 2010-05-30 15:09:06Z bittarman $ + * @version $Id: Radio.php 25109 2012-11-07 20:48:04Z rob $ */ class Zend_Form_Element_Radio extends Zend_Form_Element_Multi { @@ -45,7 +45,7 @@ * * Disables "for" attribute of label if label decorator enabled. * - * @return void + * @return Zend_Form_Element_Radio */ public function loadDefaultDecorators() { @@ -53,8 +53,14 @@ return $this; } parent::loadDefaultDecorators(); - $this->addDecorator('Label', array('tag' => 'dt', - 'disableFor' => true)); + + // Disable 'for' attribute + if (isset($this->_decorators['Label']) + && !isset($this->_decorators['Label']['options']['disableFor'])) + { + $this->_decorators['Label']['options']['disableFor'] = true; + } + return $this; } }