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

[ticket/15068] Add template vars retrieval from the template object

Browse source 
Add possibility to retrieve full block of vars

PHPBB3-15068
This commit is contained in:
javiexin 2017-03-09 16:05:39 +01:00
parent f23d9bf2e0
commit 96a90d3f81
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,7 @@ class context
* Retrieve key variable pairs from the specified block * Retrieve key variable pairs from the specified block
* *
* @param string $blockname Name of block to retrieve $vararray from * @param string $blockname Name of block to retrieve $vararray from
* @param array $vararray An array of variable names * @param array $vararray An array of variable names, empty array retrieves all vars
* @return array of hashes with variable name as key and retrieved value or null as value * @return array of hashes with variable name as key and retrieved value or null as value
*/ */
public function retrieve_block_vars($blockname, array $vararray) public function retrieve_block_vars($blockname, array $vararray)
@ -313,9 +313,25 @@ class context
} }
$result = array(); $result = array();
foreach ($vararray as $varname) if ($vararray === array())
{ {
$result[$varname] = isset($block[$varname]) ? $block[$varname] : null; // The calculated vars that depend on the block position are excluded from the complete block returned results
$excluded_vars = array('S_FIRST_ROW', 'S_LAST_ROW', 'S_BLOCK_NAME', 'S_NUM_ROWS', 'S_ROW_COUNT', 'S_ROW_NUM');
foreach ($block as $varname => $varvalue)
{
if ($varname === strtoupper($varname) && !is_array($varvalue) && !in_array($varname, $excluded_vars))
{
$result[$varname] = $varvalue;
}
}
}
else
{
foreach ($vararray as $varname)
{
$result[$varname] = isset($block[$varname]) ? $block[$varname] : null;
}
} }
return $result; return $result;
} }

2
phpBB/phpbb/template/template.php
View file

@ -162,7 +162,7 @@ interface template
/** /**
* Retrieve variable values from an specified block * Retrieve variable values from an specified block
* @param string $blockname Name of block to retrieve $vararray from * @param string $blockname Name of block to retrieve $vararray from
* @param array $vararray An array with variable names * @param array $vararray An array with variable names, empty array gets all vars
* @return array A hash of variable name => value pairs (value is null if not set) * @return array A hash of variable name => value pairs (value is null if not set)
*/ */
public function retrieve_block_vars($blockname, array $vararray); public function retrieve_block_vars($blockname, array $vararray);