Merge pull request #4880 from totten/master-cs3

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

diff --git a/api/v3/Constant.php b/api/v3/Constant.php
index 7a7df3cad9ace170750d4a29267c77ac453944ce..f9c96b894c3237c81c44d29f4d2815d4c8265d2e 100644 (file)
--- a/api/v3/Constant.php
+++ b/api/v3/Constant.php
@@ -48,7 +48,7 @@ function _civicrm_api3_constant_deprecation() {
  * @deprecated as of CiviCRM 4.4.
  * It's recommended to use the api getoptions action instead
  *
- *  @param  string  Name of a public static method of
+ * @param  string  Name of a public static method of
  *                  CRM_Core_PseudoConstant: one of
  *  <ul>
  *    <li>activityStatus</li>
@@ -93,7 +93,7 @@ function _civicrm_api3_constant_deprecation() {
  *    <li>wysiwygEditor</li>
  *  </ul>
  * @return array
- *  @example ConstantGet.php
+ * @example ConstantGet.php
  *  {@getfields constant_get}
  */
 function civicrm_api3_constant_get($params) {
@@ -103,7 +103,6 @@ function civicrm_api3_constant_get($params) {
   //ie $values = call_user_func(array('CRM_Utils_PseudoConstant', 'getConstant'), $name);
   // once tests are 100% can try removing the first block & a similar block from Generic:getoptions
 
-
   // Whitelist approach is safer
   $allowedClasses = array(
     'CRM_Core_PseudoConstant',
@@ -127,9 +126,9 @@ function civicrm_api3_constant_get($params) {
     }
     return civicrm_api3_create_success($values, $params, 'constant');
   }
-  else{
+  else {
     $values = call_user_func(array('CRM_Utils_PseudoConstant', 'getConstant'), $name);
-    if(!empty($values)){
+    if (!empty($values)) {
       return civicrm_api3_create_success($values, $params, 'constant');
     }
   }
@@ -183,13 +182,12 @@ function _civicrm_api3_constant_get_spec(&$params) {
     'worldRegion',
     'wysiwygEditor',
   );
-  $params = (array
-    ('name' => array(
+  $params = (array(
+  'name' => array(
       'title' => 'Constant Name',
       'name' => 'name',
       'api.required' => 1,
-        'options' => array_combine($options, $options)
+        'options' => array_combine($options, $options),
       ))
   );
 }
-