makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Add S_BLOCK_NAME to context, set S_NUM_ROWS in alter_block

Browse source 
PHPBB3-11598
This commit is contained in:
Nathaniel Guse 2013-07-01 10:57:57 -05:00
parent 42e3a4bfb9
commit 4ee7fb1a9d
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/includes/template/context.php
View file

@ -146,6 +146,9 @@ class phpbb_template_context
$vararray['S_FIRST_ROW'] = true; $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 // 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) // This is much more clever than going through the complete template data on display (phew)
$vararray['S_LAST_ROW'] = true; $vararray['S_LAST_ROW'] = true;
@ -159,6 +162,7 @@ class phpbb_template_context
// variable assignments. // variable assignments.
$str[$blocks[$blockcount]][] = $vararray; $str[$blocks[$blockcount]][] = $vararray;
// Set S_NUM_ROWS
foreach ($str[$blocks[$blockcount]] as &$mod_block) foreach ($str[$blocks[$blockcount]] as &$mod_block)
{ {
$mod_block['S_NUM_ROWS'] = $blockcount; $mod_block['S_NUM_ROWS'] = $blockcount;
@ -176,6 +180,9 @@ class phpbb_template_context
$vararray['S_FIRST_ROW'] = true; $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 // We always assign S_LAST_ROW and remove the entry before
$vararray['S_LAST_ROW'] = true; $vararray['S_LAST_ROW'] = true;
if ($s_row_count > 0) 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. // Add a new iteration to this block with the variable assignments we were given.
$this->tpldata[$blockname][] = $vararray; $this->tpldata[$blockname][] = $vararray;
// Set S_NUM_ROWS
foreach ($this->tpldata[$blockname] as &$mod_block)
{
$mod_block['S_NUM_ROWS'] = $blockcount;
}
} }
return true; return true;
@ -303,6 +316,9 @@ class phpbb_template_context
$vararray['S_FIRST_ROW'] = true; $vararray['S_FIRST_ROW'] = true;
} }
// Assign S_BLOCK_NAME
$vararray['S_BLOCK_NAME'] = $blockname;
// Re-position template blocks // Re-position template blocks
for ($i = sizeof($block); $i > $key; $i--) for ($i = sizeof($block); $i > $key; $i--)
{ {
@ -315,6 +331,12 @@ class phpbb_template_context
$block[$key] = $vararray; $block[$key] = $vararray;
$block[$key]['S_ROW_COUNT'] = $block[$key]['S_ROW_NUM'] = $key; $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; return true;
} }