From f8be7a805264fe35edf233303d5954a74f32f637 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 2 Oct 2011 22:26:26 -0700
Subject: [PATCH] remove options check in modal.js

---
 js/bootstrap-modal.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 72b7e3525697..76c4952599fb 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -57,12 +57,10 @@
     this.$element = $(content)
       .delegate('.close', 'click.modal', $.proxy(this.hide, this))
 
-    if ( options ) {
-      $.extend( this.settings, options )
+    $.extend( this.settings, options )
 
-      if ( this.settings.show ) {
-        this.show()
-      }
+    if ( this.settings.show ) {
+      this.show()
     }
 
     return this