Skip to content

Commit

Permalink
Prepare for 1.1.13 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
qiangxue committed Dec 30, 2012
1 parent 84a39c3 commit e9e4a0d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Yii Framework Change Log
========================

Version 1.1.13 work in progress
-------------------------------
Version 1.1.13 December 30, 2012
--------------------------------
- Bug #93: Criteria modification in CActiveRecord::beforeFind() did not apply when record was loaded in relational context. See UPGRADE instructions for details on behavior change. (cebe)
- Bug #109: formatNumber() now uses number_format() instead of round(), because of round() error in IEEE754 accuracy limitations (SonkoDmitry)
- Bug #110: MSSQL: fixed empty $primaryKey value after saving CActiveRecord model (resurtm)
Expand Down
2 changes: 1 addition & 1 deletion framework/YiiBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class YiiBase
*/
public static function getVersion()
{
return '1.1.13-dev';
return '1.1.13';
}

/**
Expand Down
7 changes: 4 additions & 3 deletions framework/yiilite.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class YiiBase
private static $_logger;
public static function getVersion()
{
return '1.1.13-RC';
return '1.1.13';
}
public static function createWebApplication($config=null)
{
Expand Down Expand Up @@ -3985,6 +3985,7 @@ public function logout($destroySession=true)
Yii::app()->getSession()->destroy();
else
$this->clearStates();
$this->_access=array();
$this->afterLogout();
}
}
Expand Down Expand Up @@ -5323,10 +5324,10 @@ public static function listData($models,$valueField,$textField,$groupField='')
}
public static function value($model,$attribute,$defaultValue=null)
{
if(is_string($attribute))
if(is_scalar($attribute) || $attribute===null)
foreach(explode('.',$attribute) as $name)
{
if(is_object($model))
if(is_object($model) && isset($model->$name))
$model=$model->$name;
elseif(is_array($model) && isset($model[$name]))
$model=$model[$name];
Expand Down

0 comments on commit e9e4a0d

Please sign in to comment.