Merge pull request #808 from callmez/master

Modal::clientOptions disable support.

framework/yii/bootstrap/Modal.php

@@ -204,10 +204,12 @@ class Modal extends Widget
 			'tabindex' => -1,
 		), $this->options);
 		Html::addCssClass($this->options, 'modal');
-
+		
-		$this->clientOptions = array_merge(array(
+		if ($this->clientOptions !== false) {
-			'show' => false,
+			$this->clientOptions = array_merge(array(
-		), $this->clientOptions);
+				'show' => false,
+			), $this->clientOptions);
+		}
 
 		if ($this->closeButton !== null) {
 			$this->closeButton = array_merge(array(