aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/extension.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2015-01-29 01:41:28 -0800
committerMatt Friedman <maf675@gmail.com>2015-01-29 01:41:28 -0800
commita62adfc1157d6b071f013f9a5f34ccc86ea39220 (patch)
tree52be99a4d65d64699c26bd61c7b5ac5f20eff0b2 /phpBB/phpbb/template/twig/extension.php
parentfc412a97ca355b910d6b6e52d4b1a28d0e8ce2c8 (diff)
downloadforums-a62adfc1157d6b071f013f9a5f34ccc86ea39220.tar
forums-a62adfc1157d6b071f013f9a5f34ccc86ea39220.tar.gz
forums-a62adfc1157d6b071f013f9a5f34ccc86ea39220.tar.bz2
forums-a62adfc1157d6b071f013f9a5f34ccc86ea39220.tar.xz
forums-a62adfc1157d6b071f013f9a5f34ccc86ea39220.zip
[ticket/10388] Use TWIG escape JS filter instead of addslashes
PHPBB3-10388
Diffstat (limited to 'phpBB/phpbb/template/twig/extension.php')
-rw-r--r--phpBB/phpbb/template/twig/extension.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php
index 3a983491b9..2eb5370b59 100644
--- a/phpBB/phpbb/template/twig/extension.php
+++ b/phpBB/phpbb/template/twig/extension.php
@@ -71,7 +71,7 @@ class extension extends \Twig_Extension
{
return array(
new \Twig_SimpleFilter('subset', array($this, 'loop_subset'), array('needs_environment' => true)),
- new \Twig_SimpleFilter('addslashes', 'addslashes'),
+ new \Twig_SimpleFilter('addslashes', 'addslashes'), // Deprecate addslashes in phpBB 3.1.4
);
}
@@ -177,7 +177,7 @@ class extension extends \Twig_Extension
return $context_vars['L_' . $key];
}
- // LA_ is transformed into lang(\'$1\')|addslashes, so we should not
+ // LA_ is transformed into lang(\'$1\')|escape('js'), so we should not
// need to check for it
return call_user_func_array(array($this->user, 'lang'), $args);