CRM_Core_BAO_Setting::getItem() - Fix calls which use deprecated parameters

[civicrm-core.git] / CRM / Admin / Form / Setting.php

diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php
index 6486759e5dc87ca2ac41f21a25166558c0434a1f..3b62810ad409e46cb948335e34e7525c02ec2a0c 100644 (file)
--- a/CRM/Admin/Form/Setting.php
+++ b/CRM/Admin/Form/Setting.php
@@ -29,11 +29,10 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
  */
 
 /**
- * This class generates form components generic to CiviCRM settings
+ * This class generates form components generic to CiviCRM settings.
  */
 class CRM_Admin_Form_Setting extends CRM_Core_Form {
 
@@ -102,8 +101,8 @@ 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);
+      $this->_defaults['enableSSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enableSSL');
+      $this->_defaults['verifySSL'] = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL');
     }
 
     return $this->_defaults;
@@ -167,6 +166,11 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
     }
   }
 
+  /**
+   * Get default entity.
+   *
+   * @return string
+   */
   public function getDefaultEntity() {
     return 'Setting';
   }
@@ -234,18 +238,6 @@ class CRM_Admin_Form_Setting extends CRM_Core_Form {
       );
     }
 
-    // update time for date formats when global time is changed
-    if (!empty($params['timeInputFormat'])) {
-      $query = "
-UPDATE civicrm_preferences_date
-SET    time_format = %1
-WHERE  time_format IS NOT NULL
-AND    time_format <> ''
-";
-      $sqlParams = array(1 => array($params['timeInputFormat'], 'String'));
-      CRM_Core_DAO::executeQuery($query, $sqlParams);
-    }
-
     // verify ssl peer option
     if (isset($params['verifySSL'])) {
       CRM_Core_BAO_Setting::setItem($params['verifySSL'],