Commit Graph

25 Commits

Author SHA1 Message Date
Anders Persson
144de3f745 optimized by replacing a function reference with direct syntax 2013-02-02 23:37:41 +01:00
Carsten Brandt
2eea4a2247 Fixed whitespace issues in doc comments of CJSON 2012-11-30 15:17:58 +01:00
Mark van den Broek
7d18b6547f Update framework/web/helpers/CJSON.php
Placed bracket on the next line to keep code style consistency.
2012-11-19 15:59:27 +01:00
Mark van den Broek
4a7e3aafbb Bugfix: issue #1726
Undefined variable: json




yii-1.1.12.b600af/framework/web/helpers/CJSON.php(332)




324     public static function decode($str, $useArray=true)
325     {
326         if(function_exists('json_decode'))
327             $json = json_decode($str,$useArray);
328 
329         // based on investigation, native fails sometimes returning null.
330         // see: http://gggeek.altervista.org/sw/article_20070425.html
331         // As of PHP 5.3.6 it still fails on some valid JSON strings
332         if(!is_null($json))
333             return $json;
2012-11-19 14:45:40 +01:00
Alexander Makarov
d865a3bab8 Fixes #1057 Removed SVN ids 2012-09-09 22:23:45 +04:00
Alexander Makarov
363f7b5479 replaced array_push with faster alternative 2012-06-10 13:21:52 +04:00
Luis Lobo Borobia
ddee67216c Sometimes CJSON::decode returns null because native json_encode has bugs and returns null. Workaround to continue decoding when result of json_decode is null. Fixes #295 2012-02-25 03:04:30 -03:00
alexander.makarow
e7b6883ebb PhpDoc corrections 2011-05-05 21:36:32 +00:00
qiang.xue
36bd645c6d CJSON::encode() can now encode non-UTF8 data 2011-05-05 05:49:02 +00:00
mdomba
ae1c1515e4 removed redundant documentation 2011-02-28 14:22:53 +00:00
keyboard.idol@gmail.com
626b59b496 (Fixes issue 1790) 2010-11-24 03:58:17 +00:00
qiang.xue
41948cac03 (Fixes issue 1790) 2010-11-23 13:49:46 +00:00
qiang.xue
25f961bcf9 * (Fixes issue 1696) Fixed the bug that CJSON might serialize float numbers into local-dependent strings 2010-10-25 18:50:08 +00:00
mdomba
ff2a43a83f Added "check" option do "build api" command 2010-09-24 11:44:06 +00:00
mdomba
3e27374d6a Fixed some typos in PHPdoc 2010-09-23 14:14:20 +00:00
mdomba
72b974560b Updated PHPDoc @param parameter names 2010-09-23 13:28:52 +00:00
mdomba
ef2ca77957 added PHPDoc param where needed 2010-09-23 12:34:33 +00:00
alexander.makarow
3ad185ed46 (Fixes issue 1252) CJSON::encode() was not able to encode models and model arrays 2010-06-04 14:49:37 +00:00
alexander.makarow
7c7fd08127 fixed typo 2010-04-17 07:30:20 +00:00
qiang.xue
b8b70bc096 Fixed typo. 2010-04-16 21:17:07 +00:00
alexander.makarow
ef91da9b99 (Fixes issue 1093) CJSON now tries to use native PHP functions prior to use Yii implementation (Sam Dark) 2010-04-16 20:00:18 +00:00
qiang.xue
00d1933a31 merge from 1.0 2009-10-27 15:57:33 +00:00
qiang.xue
a6be33eca5 merge from 1.0. 2009-01-24 19:06:11 +00:00
qiang.xue
55bdd955a5 removed carriage returns from files. 2008-10-13 21:26:19 +00:00
qiang.xue
662798d8a5 2008-09-28 12:03:53 +00:00