Fixes #4238: Fixed intolerance to nulls in CJavaScript::quote()

This commit is contained in:
stevoh6
2019-01-29 18:40:51 +01:00
committed by Alexander Makarov
parent 46bf33ace0
commit 4874064325
3 changed files with 17 additions and 6 deletions

View File

@@ -27,12 +27,14 @@ class CJavaScript
*/
public static function quote($js,$forUrl=false)
{
Yii::import('system.vendors.zend-escaper.Escaper');
$escaper=new Escaper(Yii::app()->charset);
if($forUrl)
return $escaper->escapeUrl($js);
else
return $escaper->escapeJs($js);
$js = (string)$js;
Yii::import('system.vendors.zend-escaper.Escaper');
$escaper=new Escaper(Yii::app()->charset);
if($forUrl)
return $escaper->escapeUrl($js);
else
return $escaper->escapeJs($js);
}
/**