Permalink
Browse files

Fixes issue #1207.

  • Loading branch information...
qiangxue committed Aug 14, 2012
1 parent a0775d7 commit 99487eb6e3c437beb7ee15cf529eddb5158aa918
Showing with 3 additions and 2 deletions.
  1. +1 −0 CHANGELOG
  2. +2 −2 framework/web/helpers/CHtml.php
View
@@ -15,6 +15,7 @@ Version 1.1.12 work in progress
- Bug #1109: Fixed "js:" encoding BC-break in CHtml::ajax() and related methods introduced in 1.1.11 (samdark)
- Bug #1120: Fixed duplicate events processing in CGridView when ENTER was pressed for filtering (mdomba)
- Bug #1192: CHttpCacheFilter failed to comply with RFC 2616, section 10.3.5 (DaSourcerer)
+- Bug #1207: Fixed an issue in CHtml::resolveValue() which occurs when handling tabular data input (Qiang)
- Enh #243: CWebService is now able to deal with the customized WSDL generator classes, was hardcoded to the CWsdlGenerator before, added CWebService::$generatorConfig property (resurtm)
- Enh #636: CManyManyRelation now parses foreign key for the junction table data internally, and provide public interface to access it (klimov-paul)
- Chg #1099: Changed connectionId dropdown to sticky text field in Gii model generator (mdomba)
@@ -2138,8 +2138,8 @@ public static function resolveValue($model,$attribute)
{
if($pos===0) // [a]name[b][c], should ignore [a]
{
- if(preg_match('/\](.*)/',$attribute,$matches))
- $attribute=$matches[1];
+ if(preg_match('/\](\w+(\[.+)?)/',$attribute,$matches))
+ $attribute=$matches[1]; // we get: name[b][c]
if(($pos=strpos($attribute,'['))===false)
return $model->$attribute;
}

0 comments on commit 99487eb

Please sign in to comment.