Commit b1f4d5d4 by Carsten Brandt

allow . in input name

parent 31d0538a
...@@ -1732,7 +1732,7 @@ class BaseHtml ...@@ -1732,7 +1732,7 @@ class BaseHtml
*/ */
public static function getAttributeName($attribute) public static function getAttributeName($attribute)
{ {
if (preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) { if (preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $attribute, $matches)) {
return $matches[2]; return $matches[2];
} else { } else {
throw new InvalidParamException('Attribute name must contain word characters only.'); throw new InvalidParamException('Attribute name must contain word characters only.');
...@@ -1755,7 +1755,7 @@ class BaseHtml ...@@ -1755,7 +1755,7 @@ class BaseHtml
*/ */
public static function getAttributeValue($model, $attribute) public static function getAttributeValue($model, $attribute)
{ {
if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) { if (!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $attribute, $matches)) {
throw new InvalidParamException('Attribute name must contain word characters only.'); throw new InvalidParamException('Attribute name must contain word characters only.');
} }
$attribute = $matches[2]; $attribute = $matches[2];
...@@ -1805,7 +1805,7 @@ class BaseHtml ...@@ -1805,7 +1805,7 @@ class BaseHtml
public static function getInputName($model, $attribute) public static function getInputName($model, $attribute)
{ {
$formName = $model->formName(); $formName = $model->formName();
if (!preg_match('/(^|.*\])(\w+)(\[.*|$)/', $attribute, $matches)) { if (!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $attribute, $matches)) {
throw new InvalidParamException('Attribute name must contain word characters only.'); throw new InvalidParamException('Attribute name must contain word characters only.');
} }
$prefix = $matches[1]; $prefix = $matches[1];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment