Skip to content

Commit

Permalink
Fixes issue #1207.
Browse files Browse the repository at this point in the history
  • Loading branch information
qiangxue committed Aug 14, 2012
1 parent a0775d7 commit 99487eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -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 #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 #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 #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 #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) - 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) - Chg #1099: Changed connectionId dropdown to sticky text field in Gii model generator (mdomba)
Expand Down
4 changes: 2 additions & 2 deletions framework/web/helpers/CHtml.php
Expand Up @@ -2138,8 +2138,8 @@ public static function resolveValue($model,$attribute)
{ {
if($pos===0) // [a]name[b][c], should ignore [a] if($pos===0) // [a]name[b][c], should ignore [a]
{ {
if(preg_match('/\](.*)/',$attribute,$matches)) if(preg_match('/\](\w+(\[.+)?)/',$attribute,$matches))
$attribute=$matches[1]; $attribute=$matches[1]; // we get: name[b][c]
if(($pos=strpos($attribute,'['))===false) if(($pos=strpos($attribute,'['))===false)
return $model->$attribute; return $model->$attribute;
} }
Expand Down

0 comments on commit 99487eb

Please sign in to comment.