diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed undefined variable error when escaping a js string while using UTF-8 charset.

Browse Source
This commit is contained in:
Chekote 2011-03-03 16:00:42 -06:00
parent 6790e45911
commit 4e280dfc37
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Templating/PhpEngine.php
View File

@ -412,7 +412,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
function ($value) use ($that) function ($value) use ($that)
{ {
if ('UTF-8' != $that->getCharset()) { if ('UTF-8' != $that->getCharset()) {
$string = $that->convertEncoding($value, 'UTF-8', $that->getCharset()); $value = $that->convertEncoding($value, 'UTF-8', $that->getCharset());
} }
$callback = function ($matches) use ($that) $callback = function ($matches) use ($that)
@ -430,15 +430,15 @@ class PhpEngine implements EngineInterface, \ArrayAccess
return '\\u'.substr('0000'.bin2hex($char), -4); return '\\u'.substr('0000'.bin2hex($char), -4);
}; };
if (null === $string = preg_replace_callback('#[^\p{L}\p{N} ]#u', $callback, $string)) { if (null === $value = preg_replace_callback('#[^\p{L}\p{N} ]#u', $callback, $value)) {
throw new \InvalidArgumentException('The string to escape is not a valid UTF-8 string.'); throw new \InvalidArgumentException('The string to escape is not a valid UTF-8 string.');
} }
if ('UTF-8' != $that->getCharset()) { if ('UTF-8' != $that->getCharset()) {
$string = $that->convertEncoding($string, $that->getCharset(), 'UTF-8'); $value = $that->convertEncoding($value, $that->getCharset(), 'UTF-8');
} }
return $string; return $value;
}, },
); );
} }