diff options
Diffstat (limited to '')
| -rw-r--r-- | application/views/helpers/FormDataFilter.php | 20 | ||||
| -rw-r--r-- | application/views/helpers/FormStoredPassword.php | 8 |
2 files changed, 15 insertions, 13 deletions
diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php index d8bc508..a62b906 100644 --- a/application/views/helpers/FormDataFilter.php +++ b/application/views/helpers/FormDataFilter.php @@ -44,14 +44,16 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement { $info = $this->_getInfo($name, $value, $attribs); extract($info); // id, name, value, attribs, options, listsep, disable - if (array_key_exists('columns', $attribs)) { - $this->setColumns($attribs['columns']); - unset($attribs['columns']); - } + if ($attribs) { + if (array_key_exists('columns', $attribs)) { + $this->setColumns($attribs['columns']); + unset($attribs['columns']); + } - if (array_key_exists('suggestionContext', $attribs)) { - $this->setSuggestionContext($attribs['suggestionContext']); - unset($attribs['suggestionContext']); + if (array_key_exists('suggestionContext', $attribs)) { + $this->setSuggestionContext($attribs['suggestionContext']); + unset($attribs['suggestionContext']); + } } // TODO: check for columns in attribs, preserve & remove them from the @@ -217,7 +219,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement } elseif (substr($col, $prefixLen, 5) === 'vars.') { $var = substr($col, $prefixLen + 5); - return $this->text($filter, "DataListValues!${var}"); + return $this->text($filter, "DataListValues!{$var}"); } } @@ -236,7 +238,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement $filter->getExpression(), [ 'class' => 'director-suggest', - 'data-suggestion-context' => "${type}groupnames", + 'data-suggestion-context' => "{$type}groupnames", ] ); } diff --git a/application/views/helpers/FormStoredPassword.php b/application/views/helpers/FormStoredPassword.php index e25a1dc..b746ed4 100644 --- a/application/views/helpers/FormStoredPassword.php +++ b/application/views/helpers/FormStoredPassword.php @@ -8,8 +8,8 @@ use ipl\Html\HtmlDocument; * * We're rendering the following fields: * - * - ${name}[_value]: - * - ${name}[_sent]: + * - {$name}[_value]: + * - {$name}[_sent]: * * Avoid complaints about class names: * @codingStandardsIgnoreStart @@ -26,14 +26,14 @@ class Zend_View_Helper_FormStoredPassword extends Zend_View_Helper_FormElement $res = new HtmlDocument(); $el = Html::tag('input', [ 'type' => 'password', - 'name' => "${name}[_value]", + 'name' => "{$name}[_value]", 'id' => $id, ]); $res->add($el); $res->add(Html::tag('input', [ 'type' => 'hidden', - 'name' => "${name}[_sent]", + 'name' => "{$name}[_sent]", 'value' => 'y' ])); |