From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 27 Jul 2011 12:23:49 +0000 (+0200)
Subject: merged branch JEDIBC/master (PR #401)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=945579a8f6104e55c4e8c80d606b9fae2b351b4b;p=web%2Fkonrad%2Ftwig.git

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.
---

945579a8f6104e55c4e8c80d606b9fae2b351b4b