Move CRM.url init out of template CRM-12339

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index c6a1096d69dedd89d4301fa7bf2a4349c134746a..e2f18b9a7fc3c6926d117c5355c9c7954954b836 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -445,6 +445,11 @@ class CRM_Core_Resources {
         }
       }
 
+      // Initialize CRM.url
+      $url = CRM_Utils_System::url('civicrm/example', 'placeholder', FALSE, NULL, FALSE);
+      $js = "CRM.url('init', '$url');";
+      $this->addScript($js, $jsWeight++, $region);
+
       // Give control of jQuery back to the CMS - this loads last
       $this->addScriptFile('civicrm', 'js/noconflict.js', 9999, $region, FALSE);
 

diff --git a/templates/CRM/common/scripts.tpl b/templates/CRM/common/scripts.tpl
index 26ba526b1da09c857e718f0805eb28a18eb4e85b..1d9dfb154b52dea78594e47f3445a52b4ef6e825 100644 (file)
--- a/templates/CRM/common/scripts.tpl
+++ b/templates/CRM/common/scripts.tpl
@@ -25,9 +25,6 @@
 *}
 
 <script type="text/javascript">
-  {* Initialize CRM.url *}
-  CRM.url('init', '{crmURL p="civicrm/example" q="placeholder" h=0 }');
-
 {*/*
  * Here we define the CRM object,
  * A single global variable to hold everything that needs to be accessed from the global scope