From: Jacob Thornton <jacobthornton@gmail.com>
Date: Fri, 30 Sep 2011 06:09:53 +0000 (-0700)
Subject: @dmyers settings fix #255
X-Git-Tag: v1.4.0~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87d9343a30105466cfd11f34ebebdb6368bd5a18;p=thirdparty%2Fbootstrap.git

@dmyers settings fix #255
---

diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 3267560ed7..288593ea4d 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -60,7 +60,7 @@
     if ( options ) {
       $.extend( this.settings, options )
 
-      if ( options.show ) {
+      if ( this.settings.show ) {
         this.show()
       }
     }