From c06e9cafe1b0b56057527e2bd832457abc1f3a35 Mon Sep 17 00:00:00 2001 From: callmez Date: Sun, 25 Aug 2013 04:07:30 +0800 Subject: [PATCH] Modal::clientOptions disable support. --- framework/yii/bootstrap/Modal.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/framework/yii/bootstrap/Modal.php b/framework/yii/bootstrap/Modal.php index 7dfac70..e1f042f 100644 --- a/framework/yii/bootstrap/Modal.php +++ b/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( - 'show' => false, - ), $this->clientOptions); + + if ($this->clientOptions !== false) { + $this->clientOptions = array_merge(array( + 'show' => false, + ), $this->clientOptions); + } if ($this->closeButton !== null) { $this->closeButton = array_merge(array(