From 05c2c968c3c8977b2586c77134f10a70274f7a42 Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Sat, 24 Feb 2018 16:40:00 +0100 Subject: [PATCH] Use filter_id() for the url_param and form_param Twig functions This is a follow-up to 80263a91dc5476baafa7b2a1282e40aebe9fed12 --- lib/PicoTwigExtension.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/PicoTwigExtension.php b/lib/PicoTwigExtension.php index 9d499cb..a774184 100644 --- a/lib/PicoTwigExtension.php +++ b/lib/PicoTwigExtension.php @@ -303,7 +303,8 @@ class PicoTwigExtension extends Twig_Extension */ public function urlParamFunction($name, $filter = '', $options = null, $flags = null) { - if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) { + $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false; + if (!$filter || ($filter === FILTER_CALLBACK)) { return false; } @@ -331,7 +332,8 @@ class PicoTwigExtension extends Twig_Extension */ public function formParamFunction($name, $filter = '', $options = null, $flags = null) { - if (($filter === 'callback') || ($filter === FILTER_CALLBACK)) { + $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false; + if (!$filter || ($filter === FILTER_CALLBACK)) { return false; }