diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 10:57:57 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-01 10:57:57 -0500 |
| commit | 4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf (patch) | |
| tree | b27717d315905528d3be43300d3dfb9935f41831 | |
| parent | 42e3a4bfb9653164db31637e36804945d854e9e7 (diff) | |
| download | forums-4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf.tar forums-4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf.tar.gz forums-4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf.tar.bz2 forums-4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf.tar.xz forums-4ee7fb1a9d549ce0b1c687eaddbe0bf3261ab3bf.zip | |
[feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block
PHPBB3-11598
| -rw-r--r-- | phpBB/includes/template/context.php | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/phpBB/includes/template/context.php b/phpBB/includes/template/context.php index 498568e5f4..8585e7d794 100644 --- a/phpBB/includes/template/context.php +++ b/phpBB/includes/template/context.php @@ -146,6 +146,9 @@ class phpbb_template_context $vararray['S_FIRST_ROW'] = true; } + // Assign S_BLOCK_NAME + $vararray['S_BLOCK_NAME'] = $blocks[$blockcount]; + // Now the tricky part, we always assign S_LAST_ROW and remove the entry before // This is much more clever than going through the complete template data on display (phew) $vararray['S_LAST_ROW'] = true; @@ -159,6 +162,7 @@ class phpbb_template_context // variable assignments. $str[$blocks[$blockcount]][] = $vararray; + // Set S_NUM_ROWS foreach ($str[$blocks[$blockcount]] as &$mod_block) { $mod_block['S_NUM_ROWS'] = $blockcount; @@ -176,6 +180,9 @@ class phpbb_template_context $vararray['S_FIRST_ROW'] = true; } + // Assign S_BLOCK_NAME + $vararray['S_BLOCK_NAME'] = $blocks[$blockcount]; + // We always assign S_LAST_ROW and remove the entry before $vararray['S_LAST_ROW'] = true; if ($s_row_count > 0) @@ -185,6 +192,12 @@ class phpbb_template_context // Add a new iteration to this block with the variable assignments we were given. $this->tpldata[$blockname][] = $vararray; + + // Set S_NUM_ROWS + foreach ($this->tpldata[$blockname] as &$mod_block) + { + $mod_block['S_NUM_ROWS'] = $blockcount; + } } return true; @@ -303,6 +316,9 @@ class phpbb_template_context $vararray['S_FIRST_ROW'] = true; } + // Assign S_BLOCK_NAME + $vararray['S_BLOCK_NAME'] = $blockname; + // Re-position template blocks for ($i = sizeof($block); $i > $key; $i--) { @@ -315,6 +331,12 @@ class phpbb_template_context $block[$key] = $vararray; $block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key; + // Set S_NUM_ROWS + foreach ($this->tpldata[$blockname] as &$mod_block) + { + $mod_block['S_NUM_ROWS'] = sizeof($this->tpldata[$blockname]); + } + return true; } |