From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 9 Dec 2011 09:27:23 +0000 (+0100)
Subject: merged branch JEDIBC/master (PR #556)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7359f7c9567fd2e29ecec0e5764e352693281b13;p=web%2Fkonrad%2Ftwig.git

merged branch JEDIBC/master (PR #556)

Commits
-------

3bb822e . misspell function _twig_convert_encoding -> twig_convert_encoding

Discussion
----------

misspell function _twig_convert_encoding -> twig_convert_encoding

Located in _twig_escape_js_callback, the function call was misspelled and raised a PHP Fatal error:  Call to undefined function _twig_convert_encoding() in ~/www/project/vendors/Twig/Extension/Core.php on line 585
---

7359f7c9567fd2e29ecec0e5764e352693281b13