mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 20:45:16 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1705 from EXreaction/ticket/11833

Browse Source 
Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
This commit is contained in:
David King
2013-09-12 21:17:22 -07:00
parent 70399fe66d 5166240d62
commit f02a8cf0e6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/template/twig/lexer.php
View File

@ -161,6 +161,9 @@ class phpbb_template_twig_lexer extends Twig_Lexer
$subset = trim(substr($matches[2], 1, -1)); // Remove parenthesis $subset = trim(substr($matches[2], 1, -1)); // Remove parenthesis
$body = $matches[3]; $body = $matches[3];
// Replace <!-- BEGINELSE -->
$body = str_replace('<!-- BEGINELSE -->', '{% else %}', $body);
// Is the designer wanting to call another loop in a loop? // Is the designer wanting to call another loop in a loop?
// <!-- BEGIN loop --> // <!-- BEGIN loop -->
// <!-- BEGIN !loop2 --> // <!-- BEGIN !loop2 -->
@ -205,9 +208,6 @@ class phpbb_template_twig_lexer extends Twig_Lexer
return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}"; return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}";
}; };
// Replace <!-- BEGINELSE --> correctly, only needs to be done once
$code = str_replace('<!-- BEGINELSE -->', '{% else %}', $code);
return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1 -->#s', $callback, $code); return preg_replace_callback('#<!-- BEGIN ([!a-zA-Z0-9_]+)(\([0-9,\-]+\))? -->(.+?)<!-- END \1 -->#s', $callback, $code);
} }

2
phpBB/styles/prosilver/template/mcp_notes_user.html
View File

@ -88,7 +88,7 @@
<tr> <tr>
<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td> <td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
</tr> </tr>
<!-- END usernames --> <!-- END usernotes -->
</tbody> </tbody>
</table> </table>