From 7f6349db5e82addbb5c13a29b473b88295e50448 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 16 Aug 2015 17:58:22 -0700
Subject: [PATCH] CRM-16373 - Remove `config->civiRelativeURL` and
 `civicrm_variables.tpl`

These appear to be an outmoded technique for building links in JS.  We now
CRM.url(), which does a better job anyway (w/clean or dirty URLs).
---
 CRM/Core/BAO/ConfigSetting.php             | 10 ----------
 templates/CRM/common/civicrm_variables.tpl | 10 ----------
 2 files changed, 20 deletions(-)
 delete mode 100644 templates/CRM/common/civicrm_variables.tpl

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 2941524f61..83d99da377 100644
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -68,16 +68,6 @@ class CRM_Core_BAO_ConfigSetting {
   public static function add(&$params) {
     self::fixParams($params);
 
-    // also set a template url so js files can use this
-    // CRM-6194
-    $params['civiRelativeURL'] = CRM_Utils_System::url('CIVI_BASE_TEMPLATE');
-    $params['civiRelativeURL']
-      = str_replace(
-        'CIVI_BASE_TEMPLATE',
-        '',
-        $params['civiRelativeURL']
-      );
-
     $domain = new CRM_Core_DAO_Domain();
     $domain->id = CRM_Core_Config::domainID();
     $domain->find(TRUE);
diff --git a/templates/CRM/common/civicrm_variables.tpl b/templates/CRM/common/civicrm_variables.tpl
deleted file mode 100644
index 240fb73cb2..0000000000
--- a/templates/CRM/common/civicrm_variables.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{* This contains the variables that various jQuery functions need, for instance to define the ajax url to call *}
-<script type="text/javascript">
-civicrm = new Object;
-civicrm.config = {ldelim}
-  relativeURL : "{$config->civiRelativeURL}",
-  frameworkBaseURL     : "{$config->userFrameworkBaseURL}",
-  frameworkResourceURL: "{$config->userFrameworkResourceURL}",
-  restURL = "{crmURL p='civicrm/ajax/rest' q='json=1' h=0}"
-{rdelim};
-</script>
-- 
2.25.1