CRM-13701 - Date settings - fix config->timeInputFormat

diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php
index 9344e6cd0c78933db368f90cb7d20a8eb50057e9..d999f2a43f64e2443a752b08b4e0b7258f134305 100644 (file)
--- a/CRM/Admin/Form/Setting.php
+++ b/CRM/Admin/Form/Setting.php
@@ -108,15 +108,6 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
 
       $this->_defaults['enableSSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enableSSL', NULL, 0);
       $this->_defaults['verifySSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, 1);
-
-      $sql = "
-SELECT time_format
-FROM   civicrm_preferences_date
-WHERE  time_format IS NOT NULL
-AND    time_format <> ''
-LIMIT  1
-";
-      $this->_defaults['timeInputFormat'] = CRM_Core_DAO::singleValueQuery($sql);
     }
 
     return $this->_defaults;
@@ -247,8 +238,6 @@ AND    time_format <> ''
 ";
       $sqlParams = array(1 => array($params['timeInputFormat'], 'String'));
       CRM_Core_DAO::executeQuery($query, $sqlParams);
-
-      unset($params['timeInputFormat']);
     }
 
     // verify ssl peer option

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index 16d39f40dbdb0f98046ab63dbaa8877b55710136..fc5da6fbe738b7622c20bebb4e1f71c0b20117fe 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -148,6 +148,20 @@ class CRM_Upgrade_Incremental_php_FourFour {
       CRM_Core_BAO_Setting::setItem('1', CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'disable_core_css');
     }
 
+    // CRM-13701 - Fix $config->timeInputFormat
+    $sql = "
+      SELECT time_format
+      FROM   civicrm_preferences_date
+      WHERE  time_format IS NOT NULL
+      AND    time_format <> ''
+      LIMIT  1
+    ";
+    $timeInputFormat = CRM_Core_DAO::singleValueQuery($sql);
+    if ($timeInputFormat && $timeInputFormat != $config->timeInputFormat) {
+      $params = array('timeInputFormat' => $timeInputFormat);
+      CRM_Core_BAO_ConfigSetting::add($params);
+    }
+
     $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);
   }