Merge pull request #3357 from eileenmcnaughton/CRM-14743

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

diff --git a/CRM/Utils/JSON.php b/CRM/Utils/JSON.php
index 986ed4f1c2d0f531e967719eeeba0cbb69b93cda..e55663698162c03e7f607fc3c0cb668663ab79d9 100644 (file)
--- a/CRM/Utils/JSON.php
+++ b/CRM/Utils/JSON.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -63,9 +63,10 @@ class CRM_Utils_JSON {
   /**
    * Function to encode json format for flexigrid, NOTE: "id" should be present in $params for each row
    *
-   * @param array  $params associated array of values rows
-   * @param int    $page  page no for selector
-   * @param array  $selectorElements selector rows
+   * @param array $params associated array of values rows
+   * @param int $page page no for selector
+   * @param $total
+   * @param array $selectorElements selector rows
    *
    * @return json encode string
    */
@@ -126,7 +127,6 @@ class CRM_Utils_JSON {
         if ($addcomma) {
           $sOutput .= ",";
         }
-
         //CRM-7130 --lets addslashes to only double quotes,
         //since we are using it to quote the field value.
         //str_replace helps to provide a break for new-line