Merge pull request #7336 from eileenmcnaughton/CRM-17636

[civicrm-core.git] / api / v3 / Setting.php

diff --git a/api/v3/Setting.php b/api/v3/Setting.php
index f2b4f4b64ca628ad16434f1a7bca4afdf883c4a1..2817f11643e361d399f5c3868b89eeb05a27e63a 100644 (file)
--- a/api/v3/Setting.php
+++ b/api/v3/Setting.php
@@ -144,6 +144,14 @@ function _civicrm_api3_setting_getdefaults_spec(&$params) {
   );
 }
 
+/**
+ * Get options for settings.
+ *
+ * @param array $params
+ *
+ * @return array
+ * @throws \API_Exception
+ */
 function civicrm_api3_setting_getoptions($params) {
   $specs = CRM_Core_BAO_Setting::getSettingSpecification();
 
@@ -341,10 +349,10 @@ function _civicrm_api3_setting_get_spec(&$params) {
  *   API result array.
  */
 function civicrm_api3_setting_getvalue($params) {
-  $config = CRM_Core_Config::singleton();
-  if (isset($config->$params['name'])) {
-    return $config->$params['name'];
-  }
+  //$config = CRM_Core_Config::singleton();
+  //if (isset($config->$params['name'])) {
+  //  return $config->$params['name'];
+  //}
   return CRM_Core_BAO_Setting::getItem(
     $params['group'],
     CRM_Utils_Array::value('name', $params),