diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:25:41 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-06 22:25:41 +0200 |
| commit | 5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a (patch) | |
| tree | 6256a900ecda830aa23b60d69e679b28cc41ec0d | |
| parent | a97d9d4b899c424530e53d813c71eee192262e40 (diff) | |
| parent | 32f247ed603a2b57ba0b30f4ce0d2429df33ab7e (diff) | |
| download | forums-5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a.tar forums-5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a.tar.gz forums-5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a.tar.bz2 forums-5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a.tar.xz forums-5fba9c22dd1c89eeb434ea2403ac0e9e1c00091a.zip | |
Merge remote-tracking branch 'p-push/ticket/11435' into develop
* p-push/ticket/11435:
[ticket/11435] Fit comment into 80 columns and link to php manual.
| -rw-r--r-- | phpBB/includes/template/filter.php | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/template/filter.php index 9e8ad2fef0..c2c100e93e 100644 --- a/phpBB/includes/template/filter.php +++ b/phpBB/includes/template/filter.php @@ -224,28 +224,34 @@ class phpbb_template_filter extends php_user_filter } /* - Preserve whitespace. - PHP removes a newline after the closing tag (if it's there). This is by design. + Preserve whitespace. + PHP removes a newline after the closing tag (if it's there). + This is by design: - Consider the following template: + http://www.php.net/manual/en/language.basic-syntax.phpmode.php + http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php - <!-- IF condition --> - some content - <!-- ENDIF --> - If we were to simply preserve all whitespace, we could simply replace all "?>" tags - with "?>\n". - Doing that, would add additional newlines to the compiled tempalte in place of the - IF and ENDIF statements. These newlines are unwanted (and one is conditional). - The IF and ENDIF are usually on their own line for ease of reading. + Consider the following template: - This replacement preserves newlines only for statements that aren't the only statement on a line. - It will NOT preserve newlines at the end of statements in the above examle. - It will preserve newlines in situations like: + <!-- IF condition --> + some content + <!-- ENDIF --> - <!-- IF condition -->inline content<!-- ENDIF --> + If we were to simply preserve all whitespace, we could simply + replace all "?>" tags with "?>\n". + Doing that, would add additional newlines to the compiled + template in place of the IF and ENDIF statements. These + newlines are unwanted (and one is conditional). The IF and + ENDIF are usually on their own line for ease of reading. + This replacement preserves newlines only for statements that + are not the only statement on a line. It will NOT preserve + newlines at the end of statements in the above example. + It will preserve newlines in situations like: + + <!-- IF condition -->inline content<!-- ENDIF --> */ |