Use the application charset as default charset for `$app->escape()` method.

0676cd2a · Jérôme Tamarelle · 1d62671c · 0676cd2a
Commit 0676cd2a authored Mar 21, 2012 by Jérôme Tamarelle
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/Silex/Application.php src/Silex/Application.php +2 -2

No files found.
--- a/src/Silex/Application.php
+++ b/src/Silex/Application.php
@@ -344,9 +344,9 @@ class Application extends \Pimple implements HttpKernelInterface, EventSubscribe
     *
     * @return string Escaped text
     */
-    public function escape($text, $flags = ENT_COMPAT, $charset = 'UTF-8', $doubleEncode = true)
+    public function escape($text, $flags = ENT_COMPAT, $charset = null, $doubleEncode = true)
    {
-        return htmlspecialchars($text, $flags, $charset, $doubleEncode);
+        return htmlspecialchars($text, $flags, $charset ?: $this['charset'], $doubleEncode);
    }

    /**