summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-01-12 10:26:32 +0000
committeralecpl <alec@alec.pl>2011-01-12 10:26:32 +0000
commit84581e9de7e7973ff8de20330f97f3c3a0e88b39 (patch)
treea62daba79b8d0e0e1877c9978c006e7cbee9c1a2 /program/include
parent00e18b7e428fa96cc7567316223dcc1bc4cf33b6 (diff)
- Remove some empty lines from output of template conditions
Diffstat (limited to 'program/include')
-rwxr-xr-xprogram/include/rcube_template.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index e914d2e96..92eddc2d8 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -526,7 +526,7 @@ class rcube_template extends rcube_html_page
*/
private function parse_conditions($input)
{
- $matches = preg_split('/<roundcube:(if|elseif|else|endif)\s+([^>]+)>/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
+ $matches = preg_split('/<roundcube:(if|elseif|else|endif)\s+([^>]+)>\n?/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE);
if ($matches && count($matches) == 4) {
if (preg_match('/^(else|endif)$/i', $matches[1])) {
return $matches[0] . $this->parse_conditions($matches[3]);
@@ -534,10 +534,10 @@ class rcube_template extends rcube_html_page
$attrib = parse_attrib_string($matches[2]);
if (isset($attrib['condition'])) {
$condmet = $this->check_condition($attrib['condition']);
- $submatches = preg_split('/<roundcube:(elseif|else|endif)\s+([^>]+)>/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
+ $submatches = preg_split('/<roundcube:(elseif|else|endif)\s+([^>]+)>\n?/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE);
if ($condmet) {
$result = $submatches[0];
- $result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>/Uis', '', $submatches[3], 1) : $submatches[3]);
+ $result.= ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>\n?/Uis', '', $submatches[3], 1) : $submatches[3]);
}
else {
$result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3];