aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-08-21 11:41:27 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-08-21 11:41:27 +0200
commitc20179db72d85008cae059fc208b859ec60a8df7 (patch)
tree2318999cfb8c3e34bad65e46ff551d84d59a8cd0
parent86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52 (diff)
downloadforums-c20179db72d85008cae059fc208b859ec60a8df7.tar
forums-c20179db72d85008cae059fc208b859ec60a8df7.tar.gz
forums-c20179db72d85008cae059fc208b859ec60a8df7.tar.bz2
forums-c20179db72d85008cae059fc208b859ec60a8df7.tar.xz
forums-c20179db72d85008cae059fc208b859ec60a8df7.zip
[ticket/10876] Update regex to a version which still matches our tests
PHPBB3-10876
-rw-r--r--phpBB/includes/template/filter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php
index 95a4ec5c76..abee32c8f7 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/template/filter.php
@@ -209,7 +209,7 @@ class phpbb_template_filter extends php_user_filter
*/
- $data = preg_replace('#\?\>([\r\n])#', '?>\1\1', $data);
+ $data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data);
$data = str_replace('/**/?>', "?>\n", $data);
$data = str_replace('?><?php', '', $data);
return $data;