Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-07 00:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better CStringValidator encoding handling if application charset was not set

Browse Source
This commit is contained in:
alexander.makarow
2011-03-31 21:04:59 +00:00
parent dc84724812
commit 1e236d87f1
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/validators/CStringValidator.php
View File

@@ -69,9 +69,17 @@ class CStringValidator extends CValidator
return;
if(function_exists('mb_strlen') && $this->encoding!==false)
$length=mb_strlen($value,$this->encoding ? $this->encoding : Yii::app()->charset);
{
if(!empty($this->encoding))
mb_strlen($value, $this->encoding);
else if(!empty(Yii::app()->charset))
$length=mb_strlen($value, Yii::app()->charset);
else
$length=strlen($value);
}
else
$length=strlen($value);
if($this->min!==null && $length<$this->min)
{
$message=$this->tooShort!==null?$this->tooShort:Yii::t('yii','{attribute} is too short (minimum is {min} characters).');