From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 15 Aug 2008 01:29:47 +0200 Subject: Update auf 1.13.0 --- includes/api/ApiFormatJson_json.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'includes/api/ApiFormatJson_json.php') diff --git a/includes/api/ApiFormatJson_json.php b/includes/api/ApiFormatJson_json.php index a8c649c3..87d7086e 100644 --- a/includes/api/ApiFormatJson_json.php +++ b/includes/api/ApiFormatJson_json.php @@ -45,12 +45,12 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * -* @addtogroup API +* @ingroup API * @author Michal Migurski * @author Matt Knapp * @author Brett Stimmerman * @copyright 2005 Michal Migurski -* @version CVS: $Id: JSON.php,v 1.30 2006/03/08 16:10:20 migurski Exp $ +* @version CVS: $Id: ApiFormatJson_json.php 35098 2008-05-20 17:13:28Z ialex $ * @license http://www.opensource.org/licenses/bsd-license.php * @see http://pear.php.net/pepr/pepr-proposal-show.php?id=198 */ @@ -111,7 +111,7 @@ define('SERVICES_JSON_SUPPRESS_ERRORS', 32); * $value = $json->decode($input); * * - * @addtogroup API + * @ingroup API */ class Services_JSON { @@ -257,7 +257,7 @@ class Services_JSON */ function encode2($var) { - if ($this->pretty) { + if ($this->pretty) { $close = "\n" . str_repeat("\t", $this->indent); $open = $close . "\t"; $mid = ',' . $open; @@ -426,7 +426,7 @@ class Services_JSON $this->indent++; $elements = array_map(array($this, 'encode2'), $var); $this->indent--; - + foreach($elements as $element) { if(Services_JSON::isError($element)) { return $element; @@ -703,7 +703,7 @@ class Services_JSON // element in an associative array, // for now $parts = array(); - + if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { // "name":value pair $key = $this->decode($parts[1]); @@ -815,7 +815,7 @@ class Services_JSON if (class_exists('PEAR_Error')) { /** - * @addtogroup API + * @ingroup API */ class Services_JSON_Error extends PEAR_Error { @@ -830,7 +830,7 @@ if (class_exists('PEAR_Error')) { /** * @todo Ultimately, this class shall be descended from PEAR_Error - * @addtogroup API + * @ingroup API */ class Services_JSON_Error { @@ -840,7 +840,4 @@ if (class_exists('PEAR_Error')) { } } - } - - -- cgit v1.2.3-54-g00ecf