aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_template.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-20 17:58:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-20 17:58:27 +0000
commit31e546c5e4ecd012ef9d93fa68f42c793e417303 (patch)
tree205934c32a9aff1bf4369b1f157d5d55abc1f3f6 /phpBB/includes/functions_template.php
parentfae887b3a106fef9fb5828f636402d5323ba300d (diff)
downloadforums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar
forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.gz
forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.bz2
forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.xz
forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.zip
- fixing some bugs
- removing utf8 characters from email files (has been discussed internally, you guys know why) - making sure some opendir calls are checked before calling readdir. git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_template.php')
-rw-r--r--phpBB/includes/functions_template.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index 2bbd812678..3c7259fe0a 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -483,6 +483,7 @@ class template_compile
// Allow checking if loops are set with .loopname
// It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
$blocks = explode('.', $varrefs[1]);
+
// If the block is nested, we have a reference that we can grab.
// If the block is not nested, we just go and grab the block from _tpldata
if (sizeof($blocks) > 1)
@@ -490,12 +491,14 @@ class template_compile
$block = array_pop($blocks);
$namespace = implode('.', $blocks);
$varref = $this->generate_block_data_ref($namespace, true);
+
// Add the block reference for the last child.
$varref .= "['" . $block . "']";
}
else
{
$varref = '$this->_tpldata';
+
// Add the block reference for the last child.
$varref .= "['" . $blocks[0] . "']";
}