diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-08-05 00:42:14 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-08-05 00:42:14 +0200 |
| commit | 86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52 (patch) | |
| tree | 8febee2f6e3815a7cd57d36e8a97ee8afb13730e /phpBB | |
| parent | d1e56868667234b4d8ea61a79463c3e3e47efa80 (diff) | |
| download | forums-86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52.tar forums-86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52.tar.gz forums-86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52.tar.bz2 forums-86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52.tar.xz forums-86433b5d3b6cf2bf9b55e3874d4da5c53f6d2a52.zip | |
[ticket/10876] Revert "add newline after php tag"-regex back to 3.0 version
The old regex just results in some additional new lines in the output.
So this is only beautifying and considered unworthy in respect to the dying
php servers we observed on windows.
PHPBB3-10876
Diffstat (limited to 'phpBB')
| -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..95a4ec5c76 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('#\?\>([\r\n])#', '?>\1\1', $data); $data = str_replace('/**/?>', "?>\n", $data); $data = str_replace('?><?php', '', $data); return $data; |