aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-07-04 00:14:48 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-07-04 00:14:48 +0200
commit68f001aaaf761268975d38d7ddcbdf024bb26def (patch)
treeafa75c51f61239f8ed842de8a8487a1b155ca69d /phpBB/includes/template
parent6fc997924c2c9792c8151db67e3273202951de3e (diff)
parentb3487b3167632f47d98eef25692924aa7ab25863 (diff)
downloadforums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar
forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.gz
forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.bz2
forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.xz
forums-68f001aaaf761268975d38d7ddcbdf024bb26def.zip
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600
Diffstat (limited to 'phpBB/includes/template')
-rw-r--r--phpBB/includes/template/filter.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index f2bd442010..1c0a56c9f5 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -475,6 +475,7 @@ class phpbb_template_filter extends php_user_filter
*/
private function compile_var_tags(&$text_blocks)
{
+ $is_expr = null;
$text_blocks = $this->get_varref($text_blocks, $is_expr);
$lang_replaced = $this->compile_language_tags($text_blocks);