From 83f4fcc90bf6058ec41b8cbd971bbc10d235a153 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Tue, 10 May 2022 16:41:20 +0100
Subject: [PATCH] Use a more unique placeholder url path for CiviCRM AJAX
requests
---
civicrm/js/crm.ajax.js | 6 +++---
civicrm/templates/CRM/common/l10n.js.tpl | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/civicrm/js/crm.ajax.js b/civicrm/js/crm.ajax.js
index 1a4983cc3a..4cb20cd03e 100644
--- a/civicrm/js/crm.ajax.js
+++ b/civicrm/js/crm.ajax.js
@@ -31,10 +31,10 @@
// Remove basepage as it can be changed on some CMS eg. WordPress frontend.
frag[0] = frag[0].replace('civicrm/', '/');
// Encode url path only if slashes in placeholder were also encoded
- if (tplURL[mode].indexOf('/placeholder-url-path') >= 0) {
- url = tplURL[mode].replace('/placeholder-url-path', frag[0]);
+ if (tplURL[mode].indexOf('/crmajax-placeholder-url-path') >= 0) {
+ url = tplURL[mode].replace('/crmajax-placeholder-url-path', frag[0]);
} else {
- url = tplURL[mode].replace('%2Fplaceholder-url-path', encodeURIComponent(frag[0]));
+ url = tplURL[mode].replace('%2Fcrmajax-placeholder-url-path', encodeURIComponent(frag[0]));
}
if (_.isEmpty(query)) {
diff --git a/civicrm/templates/CRM/common/l10n.js.tpl b/civicrm/templates/CRM/common/l10n.js.tpl
index 7e804f5568..67f69ada05 100644
--- a/civicrm/templates/CRM/common/l10n.js.tpl
+++ b/civicrm/templates/CRM/common/l10n.js.tpl
@@ -29,7 +29,7 @@
CRM.config.entityRef = $.extend({ldelim}{rdelim}, {$entityRef|@json_encode}, CRM.config.entityRef || {ldelim}{rdelim});
// Initialize CRM.url and CRM.formatMoney
- CRM.url({ldelim}back: '{crmURL p="civicrm/placeholder-url-path" q="civicrm-placeholder-url-query=1" h=0 fb=1}', front: '{crmURL p="civicrm/placeholder-url-path" q="civicrm-placeholder-url-query=1" h=0 fe=1}'{rdelim});
+ CRM.url({ldelim}back: '{crmURL p="civicrm/crmajax-placeholder-url-path" q="civicrm-placeholder-url-query=1" h=0 fb=1}', front: '{crmURL p="civicrm/crmajax-placeholder-url-path" q="civicrm-placeholder-url-query=1" h=0 fe=1}'{rdelim});
CRM.formatMoney('init', false, {$moneyFormat|@json_encode});
// Localize select2
--
GitLab