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

CStringValidator now uses application charset by default if mb_strlen is available

Browse Source
This commit is contained in:
alexander.makarow
2011-03-23 22:00:50 +00:00
parent 75d723bf82
commit 4a621f2f4e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/validators/CStringValidator.php
View File

@@ -48,9 +48,12 @@ class CStringValidator extends CValidator
/**
* @var string the encoding of the string value to be validated (e.g. 'UTF-8').
* Setting this property requires you to enable mbstring PHP extension.
* The value of this property will be used as the 2nd parameter of the mb_strlen() function.
* Defaults to false, which means the strlen() function will be used for calculating the length
* of the string.
* The value of this property will be used as the 2nd parameter of the
* mb_strlen() function.
*
* Defaults to application charset, which means the application charset
* will be used for calculating the length of the string if mb_strlen() is
* available and strlen() if it isn't.
* @since 1.1.1
*/
public $encoding=false;
@@ -66,8 +69,9 @@ class CStringValidator extends CValidator
$value=$object->$attribute;
if($this->allowEmpty && $this->isEmpty($value))
return;
if($this->encoding!==false && function_exists('mb_strlen'))
$length=mb_strlen($value,$this->encoding);
if(function_exists('mb_strlen'))
$length=mb_strlen($value,$this->encoding?$this->encoding:Yii::app()->charset);
else
$length=strlen($value);
if($this->min!==null && $length<$this->min)