Commit: 405ebfcd182a39f0960ff7d7055d49053d3e0316 Author: Nikita Popov <ni...@php.net> Thu, 28 Jun 2012 20:18:19 +0200 Parents: 2996eeeed094f66d57d79552d642129d60937c6d 974324676b2436f159f42d9241c569f813471684 Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=405ebfcd182a39f0960ff7d7055d49053d3e0316 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Add json_last_error_msg() function Changed paths: MM ext/json/json.c Diff: diff --cc ext/json/json.c index 5ea3070,4d29a66..b467079 --- a/ext/json/json.c +++ b/ext/json/json.c @@@ -52,11 -50,12 +53,13 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_json_dec ZEND_ARG_INFO(0, json) ZEND_ARG_INFO(0, assoc) ZEND_ARG_INFO(0, depth) + ZEND_ARG_INFO(0, options) ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_json_last_error, 0, 0, 0) - ZEND_ARG_INFO(0, as_string) + ZEND_BEGIN_ARG_INFO(arginfo_json_last_error, 0) + ZEND_END_ARG_INFO() + + ZEND_BEGIN_ARG_INFO(arginfo_json_last_error_msg, 0) ZEND_END_ARG_INFO() /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
