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

added CJavaScriptExpression while keeping BC

Browse Source
This commit is contained in:
Alexander Makarov
2012-07-27 01:54:19 +04:00
parent c1ac363f76
commit ada1cedc7d
20 changed files with 177 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework/web/helpers/CJavaScript.php
View File

@@ -51,7 +51,8 @@ class CJavaScript
* If you are encoding user input, make sure $safe is set to true.
*
* @param mixed $value PHP variable to be encoded
* @param boolean $safe If true, 'js:' will not be allowed.
* @param boolean $safe If true, 'js:' will not be allowed while
* {@link CJavaScriptExpression} will allow you to pass JavaScript expressions.
* Default is false. This parameter is available since 1.1.11.
* @return string the encoded string
*/
@@ -79,6 +80,8 @@ class CJavaScript
else
return rtrim(sprintf('%.16F',$value),'0'); // locale-independent representation
}
else if($value instanceof CJavaScriptExpression)
return (string)$value;
else if(is_object($value))
return self::encode(get_object_vars($value));
else if(is_array($value))