projects / web/konrad/twig.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3689745 3bb822e)
merged branch JEDIBC/master (PR #556)
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 9 Dec 2011 09:27:23 +0000 (10:27 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 9 Dec 2011 09:27:23 +0000 (10:27 +0100)
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


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