mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Revert INC/DEC feature. It is not consistent with the other template variables - bad idea. ;) We will get to it though... but not now.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10064 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-08-30 11:15:24 +00:00
parent 36b8b94ea6
commit fd24241044
3 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
phpBB/includes/functions_template.php
View File

@@ -191,14 +191,6 @@ class template_compile
$compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], false) . ' ?>';
break;
case 'INC':
$compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '++') . ' ?>';
break;
case 'DEC':
$compile_blocks[] = '<?php ' . $this->compile_tag_counter($block_val[2], '--') . ' ?>';
break;
case 'INCLUDE':
$temp = array_shift($include_blocks);
@@ -634,28 +626,6 @@ class template_compile
return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';';
}
/**
* Compile INC/DEC tags
* INC/DEC tags support defined template variables as well as normal template variables
* @access private
*/
function compile_tag_counter($tag_args, $operation = '++')
{
preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Z])([A-Z0-9\-_]+)#s', $tag_args, $varrefs);
if (empty($varrefs[0]))
{
return '';
}
// Build token
$token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
// Increase or decrease token ;)
return "echo {$token}{$operation};";
}
/**
* Compile INCLUDE tag
* @access private