Introduce new constant to fix issue #520, update version

WBCE · Oct 26, 2022 · 7320043 · 7320043
1 parent 22a52e1
commit 7320043
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/wbce/admin/interface/version.php b/wbce/admin/interface/version.php
@@ -14,8 +14,8 @@
 //   set WBCE version and release tag
 /////////////////////////////////////////
 
-define('NEW_WBCE_VERSION', '1.5.3'); // NEW_WBCE_VERSION
-define('NEW_WBCE_TAG', '1.5.3'); // NEW_WBCE_TAG
+define('NEW_WBCE_VERSION', '1.5.4'); // NEW_WBCE_VERSION
+define('NEW_WBCE_TAG', '1.5.4'); // NEW_WBCE_TAG
 
 defined('WBCE_VERSION') or define('WBCE_VERSION', NEW_WBCE_VERSION); // WBCE_VERSION
 defined('WBCE_TAG') or define('WBCE_TAG', NEW_WBCE_TAG);     // WBCE_TAG

diff --git a/wbce/framework/class.wb.php b/wbce/framework/class.wb.php
@@ -903,7 +903,11 @@ public function register_modfiles($sModfileType = "css", $sEndPosition = "fronte
                 break;
             case 'js':
                 // insert system vars to be ready for all JS code
-                $sJsSysvars = "\t\tvar URL = WB_URL = '" . WB_URL . "';";
+				if (defined("URL_VAR_COMPATIBILITY_MODE") && URL_VAR_COMPATIBILITY_MODE==true) {
+					$sJsSysvars = "\t\tvar URL = WB_URL = '" . WB_URL . "';";
+				} else {
+					$sJsSysvars = "\t\tvar WB_URL = '" . WB_URL . "';";
+				}
 
                 if (defined("LANGUAGE")) {
                     $sJsSysvars .= "\n\t\tvar LANGUAGE     = '" . strtolower(LANGUAGE) . "';";