mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Why did I not do it this way to begin with :)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9097 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2008-11-23 16:01:33 +00:00
parent 3bd6984785
commit aa3a2f565b
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
phpBB/includes/functions_template.php
View File

@ -420,21 +420,24 @@ class template_filter extends php_user_filter
// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
if ($varrefs[3] == 'S_ROW_NUM' || $varrefs[3] == 'S_ROW_COUNT')
switch ($varrefs[3])
{
$token = "\$_${namespace}_i";
}
else if ($varrefs[3] == 'S_FIRST_ROW')
{
$token = "(\$_${namespace}_i == 0)";
}
else if ($varrefs[3] == 'S_LAST_ROW')
{
$token = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
}
else
{
$token = $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']';
case 'S_ROW_NUM':
case 'S_ROW_COUNT':
$token = "\$_${namespace}_i";
break;
case 'S_FIRST_ROW':
$token = "(\$_${namespace}_i == 0)";
break;
case 'S_LAST_ROW':
$token = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
break;
default:
$token = $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']';
break;
}
}
else
@ -608,26 +611,29 @@ class template_filter extends php_user_filter
// S_ROW_COUNT is deceptive, it returns the current row number now the number of rows
// hence S_ROW_COUNT is deprecated in favour of S_ROW_NUM
if ($varname == 'S_ROW_NUM' || $varname == 'S_ROW_COUNT')
switch ($varname)
{
$varref = "\$_${namespace}_i";
}
else if ($varname == 'S_FIRST_ROW')
{
$varref = "(\$_${namespace}_i == 0)";
}
else if ($varname == 'S_LAST_ROW')
{
$varref = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
}
else
{
// Get a reference to the data block for this namespace.
$varref = $this->generate_block_data_ref($namespace, true, $defop);
// Prepend the necessary code to stick this in an echo line.
case 'S_ROW_NUM':
case 'S_ROW_COUNT':
$varref = "\$_${namespace}_i";
break;
// Append the variable reference.
$varref .= "['$varname']";
case 'S_FIRST_ROW':
$varref = "(\$_${namespace}_i == 0)";
break;
case 'S_LAST_ROW':
$varref = "(\$_${namespace}_i == \$_${namespace}_count - 1)";
break;
default:
// Get a reference to the data block for this namespace.
$varref = $this->generate_block_data_ref($namespace, true, $defop);
// Prepend the necessary code to stick this in an echo line.
// Append the variable reference.
$varref .= "['$varname']";
break;
}
$varref = ($echo) ? "<?php echo $varref; ?>" : ((isset($varref)) ? $varref : '');