projects / web/konrad/twig.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit945579a8f6104e55c4e8c80d606b9fae2b351b4b
treefc1eda71a3e87a1accb6fc9626a76c89c0cea05dtree | snapshot
parent26757ab327fedf6e690d748f34e9e3a8879743a6commit | diff
parent755ea99bd4944ab2e090e3b7a9f1cf003b805e68commit | diff
merged branch JEDIBC/master (PR #401)

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.
Unnamed repository; edit this file 'description' to name the repository.