tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Form: Don't override Zend_Form::setDefaults() 

fixes #7315
This commit is contained in:
Eric Lippmann 2014-10-08 17:43:28 +02:00
parent db804f9a55
commit cc61dc2b01
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Icinga/Web/Form.php
View File

@ -14,6 +14,18 @@ use Icinga\Web\Form\Element\CsrfCounterMeasure;
/** /**
* Base class for forms providing CSRF protection, confirmation logic and auto submission * Base class for forms providing CSRF protection, confirmation logic and auto submission
*
* @method $this setDefaults(array $defaults) {
* Use `Form::populate()' for setting default values for elements instead because `Form::setDefaults()' does not
* create the form via `Form::create()'.
*
* Due to a BC introduced with https://github.com/mhujer/zf1/commit/244e3d3f88a363ee0ca49cf63eee31f925f515cd
* we cannot override this function without running into a strict standards violation on Zend version 1.12.7.
*
* @param array $defaults
*
* @return $this
* }
*/ */
class Form extends Zend_Form class Form extends Zend_Form
{ {
@ -508,10 +520,10 @@ class Form extends Zend_Form
* *
* @param array $defaults The values to populate the elements with * @param array $defaults The values to populate the elements with
*/ */
public function setDefaults(array $defaults) public function populate(array $defaults)
{ {
$this->create($defaults); $this->create($defaults);
return parent::setDefaults($defaults); return parent::populate($defaults);
} }
/** /**