projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26757ab 755ea99)
merged branch JEDIBC/master (PR #401)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jul 2011 12:23:49 +0000 (14:23 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jul 2011 12:23:49 +0000 (14:23 +0200)
Commits
-------

755ea99 Correction of a BC break with json_encode and PHP 5.2.x

Discussion
----------

BC break with json_encode and php 5.2.x

Hi,

json_encode on php 5.2.x doesn't take the $options parameter wich result in a warning and the function return nothing.

Cheers.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.