diff options
| author | David King <imkingdavid@gmail.com> | 2012-09-08 15:58:25 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-09-08 15:58:25 -0400 |
| commit | 8a91598b14e0c638a7674294790a3f4079c58758 (patch) | |
| tree | cef0af43111bd1a7c6aa4690d53e9ad600761620 /phpBB/includes | |
| parent | 23b00d393cd39336befb81c4f422f4e04aefdbf4 (diff) | |
| parent | c20179db72d85008cae059fc208b859ec60a8df7 (diff) | |
| download | forums-8a91598b14e0c638a7674294790a3f4079c58758.tar forums-8a91598b14e0c638a7674294790a3f4079c58758.tar.gz forums-8a91598b14e0c638a7674294790a3f4079c58758.tar.bz2 forums-8a91598b14e0c638a7674294790a3f4079c58758.tar.xz forums-8a91598b14e0c638a7674294790a3f4079c58758.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/10876' into develop
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/template/filter.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php index ad2e35de6a..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('~(?<!^)(<\?php(?:(?<!\?>).)+(?<!/\*\*/)\?>)$~m', "$1\n", $data); + $data = preg_replace('~(?<!^)(<\?php.+(?<!/\*\*/)\?>)$~m', "$1\n", $data); $data = str_replace('/**/?>', "?>\n", $data); $data = str_replace('?><?php', '', $data); return $data; |