Skip to content

Commit

Permalink
prepare for 1.1.7 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
qiang.xue committed Mar 27, 2011
1 parent 1827c4b commit 71dab6b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Yii Framework Change Log
========================

Version 1.1.7 to be released
Version 1.1.7 March 27, 2011
----------------------------
- Bug #1080: Correct recursive merging for CDbCriteria::with (creocoder, Sam Dark)
- Bug #1624: Fixed the bug that Gii would generate only one relation for a parent that has a child with more FK linking to it (mdomba)
Expand Down
2 changes: 1 addition & 1 deletion framework/YiiBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class YiiBase
*/
public static function getVersion()
{
return '1.1.7-dev';
return '1.1.7';
}

/**
Expand Down
8 changes: 4 additions & 4 deletions framework/yiilite.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class YiiBase
private static $_logger;
public static function getVersion()
{
return '1.1.7-dev';
return '1.1.7';
}
public static function createWebApplication($config=null)
{
Expand Down Expand Up @@ -9112,14 +9112,14 @@ class CStringValidator extends CValidator
public $tooShort;
public $tooLong;
public $allowEmpty=true;
public $encoding=false;
public $encoding;
protected function validateAttribute($object,$attribute)
{
$value=$object->$attribute;
if($this->allowEmpty && $this->isEmpty($value))
return;
if(function_exists('mb_strlen'))
$length=mb_strlen($value,$this->encoding?$this->encoding:Yii::app()->charset);
if(function_exists('mb_strlen') && $this->encoding!==false)
$length=mb_strlen($value,$this->encoding ? $this->encoding : Yii::app()->charset);
else
$length=strlen($value);
if($this->min!==null && $length<$this->min)
Expand Down

0 comments on commit 71dab6b

Please sign in to comment.