Merge pull request #5097 from PalanteJon/CRM-15917

[civicrm-core.git] / CRM / Utils / JSON.php

diff --git a/CRM/Utils/JSON.php b/CRM/Utils/JSON.php
index 0fdbc7a01b87fefdf82c2461cebece0ecddb8190..adb349fb900ecbe40bda112f5839d95a0a751fb7 100644 (file)
--- a/CRM/Utils/JSON.php
+++ b/CRM/Utils/JSON.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -39,7 +39,7 @@
 class CRM_Utils_JSON {
 
   /**
-   * Output json to the client
+   * Output json to the client.
    * @param mixed $input
    */
   public static function output($input) {
@@ -49,7 +49,7 @@ class CRM_Utils_JSON {
   }
 
   /**
-   * Create JSON object
+   * Create JSON object.
    * @deprecated
    *
    * @param array $params
@@ -60,7 +60,6 @@ class CRM_Utils_JSON {
    *
    * @return string
    *   JSON array
-   * @static
    */
   public static function encode($params, $identifier = 'id') {
     $buildObject = array();
@@ -85,7 +84,8 @@ class CRM_Utils_JSON {
    * @param array $selectorElements
    *   Selector rows.
    *
-   * @return json encode string
+   * @return string
+   *   json encoded string
    */
   public static function encodeSelector(&$params, $page, $total, $selectorElements) {
     $json = "";
@@ -121,7 +121,7 @@ class CRM_Utils_JSON {
   }
 
   /**
-   * encode data for dataTable plugin
+   * encode data for dataTable plugin.
    *
    * @param array $params
    *   Associated array of row elements.
@@ -164,4 +164,5 @@ class CRM_Utils_JSON {
 
     return $sOutput;
   }
+
 }