mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-11 23:14:34 +02:00
Code Issues Releases Wiki Activity

[feature/twig] Fix indentation

Browse Source 
PHPBB3-11598
This commit is contained in:
Nathaniel Guse
2013-07-02 12:34:16 -05:00
parent f102f609f5
commit 57c2d99e65
16 changed files with 353 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
phpBB/includes/template/twig/node/include.php
View File

@@ -9,14 +9,14 @@
class phpbb_template_twig_node_include extends Twig_Node_Include
{
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{
$compiler->addDebugInfo($this);
/**
* Compiles the node to PHP.
*
* @param Twig_Compiler A Twig_Compiler instance
*/
public function compile(Twig_Compiler $compiler)
{
$compiler->addDebugInfo($this);
$compiler
->write("\$location = ")
@@ -26,15 +26,15 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
->write("if (strpos(\$location, '@') === 0) {\n")
->indent()
->write("\$namespace = substr(\$location, 1, strpos(\$location, '/') - 1);\n")
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
// We set the namespace lookup order to be this namespace first, then the main path
->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
// We set the namespace lookup order to be this namespace first, then the main path
->write("\$this->env->setNamespaceLookUpOrder(array(\$namespace, '__main__'));\n")
->outdent()
->write("}\n")
;
parent::compile($compiler);
parent::compile($compiler);
$compiler
->write("if (\$namespace) {\n")
@@ -42,6 +42,6 @@ class phpbb_template_twig_node_include extends Twig_Node_Include
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n")
->outdent()
->write("}\n")
;
}
;
}
}