(Fixes issue 2320) CListView now doesn't register clientscripts if no…

… AJAX is used
yiisoft · Apr 15, 2011 · 71b59de · 71b59de
1 parent cf953b8
commit 71b59de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -15,6 +15,7 @@ Version 1.1.8 work in progress
 - Enh #2268: Added CClientScript::getPackageBaseUrl() (Qiang)
 - Enh #2273: Used better merging algorithm to build query parameters that are of array type in CUrlManager (Qiang)
 - Enh #2299: Added CAssetManager.newFileMode and newDirMode (Qiang)
+- Eng #2320: CListView now doesn't register clientscripts if no AJAX is used (Sam Dark)
 - Enh #2325: Added $option parameter to CDbCommand::select() to support special SELECT syntax (Qiang)
 - Enh: Added CHttpSession::regenerateID() and improved CWebUser::changeIdentity() by regenerating session ID (Qiang)
 - Enh: Added CActiveRecord::saveCounters() (Qiang)

diff --git a/framework/zii/widgets/CListView.php b/framework/zii/widgets/CListView.php
@@ -188,9 +188,9 @@ public function registerClientScript()
 		$id=$this->getId();
 
 		if($this->ajaxUpdate===false)
-			$ajaxUpdate=array();
-		else
-			$ajaxUpdate=array_unique(preg_split('/\s*,\s*/',$this->ajaxUpdate.','.$id,-1,PREG_SPLIT_NO_EMPTY));
+			return;
+
+		$ajaxUpdate=array_unique(preg_split('/\s*,\s*/',$this->ajaxUpdate.','.$id,-1,PREG_SPLIT_NO_EMPTY));
 		$options=array(
 			'ajaxUpdate'=>$ajaxUpdate,
 			'ajaxVar'=>$this->ajaxVar,