Make clientside CRM.config.resourceBase absolute

diff --git a/js/wysiwyg/crm.ckeditor.js b/js/wysiwyg/crm.ckeditor.js
index b91c0eab17fdb402460beddb4108e9c1419cddab..b856dee0289fbc255a5e8d595591cc7b3caa766b 100644 (file)
--- a/js/wysiwyg/crm.ckeditor.js
+++ b/js/wysiwyg/crm.ckeditor.js
@@ -63,8 +63,8 @@
     
     function initialize() {
       var
-        browseUrl = CRM.config.userFrameworkResourceURL + "packages/kcfinder/browse.php?cms=civicrm",
-        uploadUrl = CRM.config.userFrameworkResourceURL + "packages/kcfinder/upload.php?cms=civicrm";
+        browseUrl = CRM.config.resourceBase + "packages/kcfinder/browse.php?cms=civicrm",
+        uploadUrl = CRM.config.resourceBase + "packages/kcfinder/upload.php?cms=civicrm";
 
       CKEDITOR.replace($(item)[0], {
         filebrowserBrowseUrl: browseUrl + '&type=files',
@@ -86,7 +86,7 @@
         initialize();
       } else {
         if (scriptLoaded === false) {
-          scriptLoaded = loadScript(CRM.config.userFrameworkResourceURL + 'bower_components/ckeditor/ckeditor.js');
+          scriptLoaded = loadScript(CRM.config.resourceBase + 'bower_components/ckeditor/ckeditor.js');
         }
         scriptLoaded.done(initialize);
       }

diff --git a/templates/CRM/common/l10n.js.tpl b/templates/CRM/common/l10n.js.tpl
index 2539d59a18b485077359f4f58e6fd04dde72bdd5..23930385d7885ebecc58e1e43eae437006ef9816 100644 (file)
--- a/templates/CRM/common/l10n.js.tpl
+++ b/templates/CRM/common/l10n.js.tpl
@@ -28,12 +28,11 @@
 (function($) {ldelim}
   // Config settings
   CRM.config.userFramework = {$config->userFramework|@json_encode};
-  CRM.config.resourceBase = {$config->resourceBase|@json_encode};
+  CRM.config.resourceBase = {$config->userFrameworkResourceURL|@json_encode};
   CRM.config.lcMessages = {$config->lcMessages|@json_encode};
   $.datepicker._defaults.dateFormat = CRM.config.dateInputFormat = {$config->dateInputFormat|@json_encode};
   CRM.config.timeIs24Hr = {if $config->timeInputFormat eq 2}true{else}false{/if};
   CRM.config.ajaxPopupsEnabled = {$ajaxPopupsEnabled|@json_encode};
-  CRM.config.userFrameworkResourceURL = {$config->userFrameworkResourceURL|@json_encode};
 
   // Merge entityRef settings
   CRM.config.entityRef = $.extend({ldelim}{rdelim}, {$entityRef|@json_encode}, CRM.config.entityRef || {ldelim}{rdelim});