remove second parameter on calls

chayn1k · Aug 7, 2012 · 3fd13f9 · 3fd13f9
1 parent 789938d
commit 3fd13f9
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/framework/web/helpers/CHtml.php b/framework/web/helpers/CHtml.php
@@ -1048,7 +1048,7 @@ public static function ajax($options)
 		foreach(array('beforeSend','complete','error','success') as $name)
 		{
 			if(isset($options[$name]) && !($options[$name] instanceof CJavaScriptExpression))
-				$options[$name]=new CJavaScriptExpression($options[$name], true);
+				$options[$name]=new CJavaScriptExpression($options[$name]);
 		}
 		if(isset($options['update']))
 		{

diff --git a/framework/web/widgets/CAutoComplete.php b/framework/web/widgets/CAutoComplete.php
@@ -286,7 +286,7 @@ protected function getClientOptions()
 				if($this->$func instanceof CJavaScriptExpression)
 					$options[$func]=$this->$func;
 				else
-					$options[$func]=new CJavaScriptExpression($this->$func, true);
+					$options[$func]=new CJavaScriptExpression($this->$func);
 			}
 		}
 

diff --git a/framework/web/widgets/CMaskedTextField.php b/framework/web/widgets/CMaskedTextField.php
@@ -107,7 +107,7 @@ protected function getClientOptions()
 			if($this->completed instanceof CJavaScriptExpression)
 				$options['completed']=$this->completed;
 			else
-				$options['completed']=new CJavaScriptExpression($this->completed, true);
+				$options['completed']=new CJavaScriptExpression($this->completed);
 		}
 
 		return $options;

diff --git a/framework/web/widgets/CMultiFileUpload.php b/framework/web/widgets/CMultiFileUpload.php
@@ -120,7 +120,7 @@ protected function getClientOptions()
 		foreach(array('onFileRemove','afterFileRemove','onFileAppend','afterFileAppend','onFileSelect','afterFileSelect') as $event)
 		{
 			if(isset($options[$event]) && !($options[$event] instanceof CJavaScriptExpression))
-				$options[$event]=new CJavaScriptExpression($options[$event], true);
+				$options[$event]=new CJavaScriptExpression($options[$event]);
 		}
 
 		if($this->accept!==null)

diff --git a/framework/web/widgets/CStarRating.php b/framework/web/widgets/CStarRating.php
@@ -198,7 +198,7 @@ protected function getClientOptions()
 				if($this->$event instanceof CJavaScriptExpression)
 					$options[$event]=$this->$event;
 				else
-					$options[$event]=new CJavaScriptExpression($this->$event, true);
+					$options[$event]=new CJavaScriptExpression($this->$event);
 			}
 		}
 		return $options;

diff --git a/framework/zii/widgets/CListView.php b/framework/zii/widgets/CListView.php
@@ -225,7 +225,7 @@ public function registerClientScript()
 				if($this->$event instanceof CJavaScriptExpression)
 					$options[$event]=$this->$event;
 				else
-					$options[$event]=new CJavaScriptExpression($this->$event, true);
+					$options[$event]=new CJavaScriptExpression($this->$event);
 			}
 		}
 

diff --git a/framework/zii/widgets/grid/CButtonColumn.php b/framework/zii/widgets/grid/CButtonColumn.php
@@ -176,7 +176,7 @@ public function init()
 				if(!isset($button['options']['class']))
 					$this->buttons[$id]['options']['class']=$id;
 				if(!($button['click'] instanceof CJavaScriptExpression))
-					$this->buttons[$id]['click']=new CJavaScriptExpression($button['click'], true);
+					$this->buttons[$id]['click']=new CJavaScriptExpression($button['click']);
 			}
 		}
 

diff --git a/framework/zii/widgets/grid/CGridView.php b/framework/zii/widgets/grid/CGridView.php
@@ -400,7 +400,7 @@ public function registerClientScript()
 				if($this->$event instanceof CJavaScriptExpression)
 					$options[$event]=$this->$event;
 				else
-					$options[$event]=new CJavaScriptExpression($this->$event, true);
+					$options[$event]=new CJavaScriptExpression($this->$event);
 			}
 		}
 

diff --git a/framework/zii/widgets/jui/CJuiButton.php b/framework/zii/widgets/jui/CJuiButton.php
@@ -169,7 +169,7 @@ public function run()
 			if($this->onclick!==null)
 			{
 				if(!($this->onclick instanceof CJavaScriptExpression))
-					$this->onclick=new CJavaScriptExpression($this->onclick, true);
+					$this->onclick=new CJavaScriptExpression($this->onclick);
 				$click = CJavaScript::encode($this->onclick);
 				$cs->registerScript(__CLASS__.'#'.$id,"jQuery('#{$id}').button($options).click($click);");
 			}