[fusion-commits] r1620 - trunk/lib

svn_fusion at osgeo.org svn_fusion at osgeo.org
Mon Oct 27 15:36:21 EDT 2008


Author: madair
Date: 2008-10-27 15:36:21 -0400 (Mon, 27 Oct 2008)
New Revision: 1620

Modified:
   trunk/lib/fusion.js
Log:
closes #78: also check for https as the host protocol

Modified: trunk/lib/fusion.js
===================================================================
--- trunk/lib/fusion.js	2008-10-27 19:35:59 UTC (rev 1619)
+++ trunk/lib/fusion.js	2008-10-27 19:36:21 UTC (rev 1620)
@@ -257,8 +257,8 @@
                      */
             var test = window.location.protocol+'//'+window.location.host;
             var configUrl = 'config.json';
-            //if (this.fusionURL.indexOf(test,0) == 0) {
-            if ( ((this.fusionURL.indexOf("http://") < 0) || (this.fusionURL.indexOf(test,0) == 0)) && !(this.bForceRedirect)) {
+            if ( ( ((this.fusionURL.indexOf("http://") < 0) && (this.fusionURL.indexOf("https://") < 0)) ||
+              (this.fusionURL.indexOf(test,0) == 0) ) && !(this.bForceRedirect)) {
                 this.sRedirectScript = '';
             } else {
                 this.sRedirectScript = 'redirect.php';



More information about the fusion-commits mailing list