CRM-11823 - Conditionally disable all existing codes that render html-header

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
index 96a627a71ead5cbb95d93476caad131cae384a9a..8d69a0a80782e2e00023c25aa86ff20dfe93c422 100644 (file)
--- a/CRM/Core/Page.php
+++ b/CRM/Core/Page.php
@@ -206,7 +206,7 @@ class CRM_Core_Page {
     $content = self::$_template->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');
 
     // Render page header
-    if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+    if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
       CRM_Utils_System::addHTMLHead($region->render(''));
     }
     CRM_Utils_System::appendTPLFile($pageTemplateFile, $content);

diff --git a/CRM/Core/QuickForm/Action/Display.php b/CRM/Core/QuickForm/Action/Display.php
index e5a44259f460f1ff46c9fd2968d8c407ba5a20b8..13e13a8ac04376ca1cd35b1ad9d135982c544836 100644 (file)
--- a/CRM/Core/QuickForm/Action/Display.php
+++ b/CRM/Core/QuickForm/Action/Display.php
@@ -137,7 +137,7 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
 
     $content = $template->fetch($controller->getTemplateFile());
 
-    if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+    if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
       CRM_Utils_System::addHTMLHead($region->render(''));
     }
     CRM_Utils_System::appendTPLFile($pageTemplateFile,

diff --git a/CRM/Queue/Page/Runner.php b/CRM/Queue/Page/Runner.php
index 64ff0102f89e25cc3c13ba54d6640052f7bcbda0..5a66e9f61b2c7b9b06168f0166c5ad676bc04e2c 100644 (file)
--- a/CRM/Queue/Page/Runner.php
+++ b/CRM/Queue/Page/Runner.php
@@ -69,7 +69,7 @@ class CRM_Queue_Page_Runner extends CRM_Core_Page {
 
     if ($runner->isMinimal) {
       // Render page header
-      if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+      if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
         CRM_Utils_System::addHTMLHead($region->render(''));
       }
       $smarty = CRM_Core_Smarty::singleton();

diff --git a/CRM/Upgrade/Page/Upgrade.php b/CRM/Upgrade/Page/Upgrade.php
index df384d3e19ea5e83074ef03a9e8a270171beacba..eda53978931dbc22f480ed715681de894dfe2a0a 100644 (file)
--- a/CRM/Upgrade/Page/Upgrade.php
+++ b/CRM/Upgrade/Page/Upgrade.php
@@ -115,7 +115,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     $template->assign('upgraded', FALSE);
 
     // Render page header
-    if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+    if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
       CRM_Utils_System::addHTMLHead($region->render(''));
     }
 
@@ -190,7 +190,7 @@ class CRM_Upgrade_Page_Upgrade extends CRM_Core_Page {
     $template->assign('upgraded', TRUE);
 
     // Render page header
-    if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+    if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
       CRM_Utils_System::addHTMLHead($region->render(''));
     }
 

diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php
index d2d4e0c4823e39d68bd673937a2a7ccb79be50fc..28b088adf2099c31edcfc9f26efcca16d89cf16e 100644 (file)
--- a/CRM/Utils/REST.php
+++ b/CRM/Utils/REST.php
@@ -515,7 +515,7 @@ class CRM_Utils_REST {
         $config = CRM_Core_Config::singleton();
         $content = $smarty->fetch( 'CRM/common/'. strtolower($config->userFramework) .'.tpl' );
 
-        if ($region = CRM_Core_Region::instance('html-header', FALSE)) {
+        if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
           CRM_Utils_System::addHTMLHead($region->render(''));
         }
         CRM_Utils_System::appendTPLFile( $tpl, $content );

diff --git a/CRM/Utils/String.php b/CRM/Utils/String.php
index 9289125691bbd5303919f3307a88d14e9b016237..abafc42cf28fd05fbc17609482553bdd35772c6d 100644 (file)
--- a/CRM/Utils/String.php
+++ b/CRM/Utils/String.php
@@ -488,7 +488,11 @@ class CRM_Utils_String {
    */
   static function addJqueryFiles(&$html) {
     CRM_Core_Resources::singleton()->addCoreResources('html-header');
-    return CRM_Core_Region::instance('html-header')->render('', FALSE) . $html;
+    if (!defined('CIVICRM_UF_HEAD')) {
+      return CRM_Core_Region::instance('html-header')->render('', FALSE) . $html;
+    } else {
+      return $html;
+    }
   }
 
   /**