From 95c0a77c0e4e61570d5ff47da4e4c6da571cc7ea Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 1 Nov 2013 11:43:30 -0700 Subject: [PATCH] CRM-12578 - Upgrade - Preserve old css override behavior --- CRM/Upgrade/Incremental/php/FourFour.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php index 19f0ad3e48..16d39f40db 100644 --- a/CRM/Upgrade/Incremental/php/FourFour.php +++ b/CRM/Upgrade/Incremental/php/FourFour.php @@ -104,6 +104,7 @@ class CRM_Upgrade_Incremental_php_FourFour { } function upgrade_4_4_1($rev) { + $config = CRM_Core_Config::singleton(); // CRM-13327 upgrade handling for the newly added name badges $ogID = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', 'name_badge', 'id', 'name'); $nameBadges = array_flip(array_values(CRM_Core_BAO_OptionValue::getOptionValuesAssocArrayFromName('name_badge'))); @@ -140,6 +141,13 @@ class CRM_Upgrade_Incremental_php_FourFour { } } + // CRM-12578 - Prior to this version a CSS file under drupal would disable core css + if (!empty($config->customCSSURL) && strpos($config->userFramework, 'Drupal') === 0) { + // The new setting doesn't exist yet - need to create it first + CRM_Core_BAO_Setting::updateSettingsFromMetaData(); + CRM_Core_BAO_Setting::setItem('1', CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'disable_core_css'); + } + $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.4.1')), 'task_4_4_x_runSql', $rev); $this->addTask('Patch word-replacement schema', 'wordReplacements_patch', $rev); } -- 2.25.1