[1.7.1] Conditional tags inside other conditional tags + {ifno ...}{endifno ...}

Since v1.7.1 introduced new, optimized template engine, a little bug was created which would not allow use conditional tags inside other conditional tags:

Quote

{if blah}{if blah2}...{endif blah2}{endif blah}

the {if blah2}{endif blah2} would be ignored.
Also, in this fix I added new feature {ifno blah}{endifno blah} type of conditional tags. That condition is opposite of {if blah} meaning that code between these tags will be showed only if {blah} tag is empty.

Open includes/templates.php
Find:

Code: [Select] [Expand] [Hide line numbers]

1
2
3
4
5
6 // Compile condition tags $template = preg_replace_callback( '='.preg_quote($this->start).'if\s+([A-Z0-9_]+)'.preg_quote($this->end).'(.*)'.preg_quote($this->start).'endif\s+(\\1+)'.preg_quote($this->end).'=Usi', array(&$this, '_compile_condition'), $template );

Replace it with:

Code: [Select] [Expand] [Hide line numbers]

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21 // Compile condition tags $template = preg_replace_callback( '='.preg_quote($this->start).'if\s+([A-Z0-9_]+)'.preg_quote($this->end).'=Usi', array(&$this, '_compile_condition_start'), $template ); $template = preg_replace_callback( '='.preg_quote($this->start).'endif\s+([A-Z0-9_]+)'.preg_quote($this->end).'=Usi', array(&$this, '_compile_condition_end'), $template ); $template = preg_replace_callback( '='.preg_quote($this->start).'ifno\s+([A-Z0-9_]+)'.preg_quote($this->end).'=Usi', array(&$this, '_compile_condition_no_start'), $template ); $template = preg_replace_callback( '='.preg_quote($this->start).'endifno\s+([A-Z0-9_]+)'.preg_quote($this->end).'=Usi', array(&$this, '_compile_condition_no_end'), $template );

Then find:

Code: [Select] [Expand] [Hide line numbers]

1
2
3 function _compile_condition(&$matches) { return '<?php if (!empty($' . trim($matches[1]) . ') && $' . trim($matches[1]) . ' != REPLACE_EMPTY): ?>' . $matches[2] . '<?php endif; ?>'; }

Replace it with:

Code: [Select] [Expand] [Hide line numbers]

1
2
3
4
5
6
7
8
9
10
11
12 function _compile_condition_start(&$matches) { return '<?php if (!empty($' . trim($matches[1]) . ') && $' . trim($matches[1]) . ' != REPLACE_EMPTY){ ?>'; } function _compile_condition_end(&$matches) { return '<?php } ?>'; } function _compile_condition_no_start(&$matches) { return '<?php if (empty($' . trim($matches[1]) . ') || $' . trim($matches[1]) . ' == REPLACE_EMPTY){ ?>'; } function _compile_condition_no_end(&$matches) { return '<?php } ?>'; }

P.S. if u dont need {ifno ..} feature, then I think it wouldn't be too dificult to figure out what needed to be removed Wink