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

- fix the template error (no headers displayed, wrong ! assignment, wrong check for .loop)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5766 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-04-08 10:56:08 +00:00
parent 431e494ae4
commit 4801f813cd
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View file

@ -872,7 +872,7 @@ class acp_users
foreach ($var_ary as $var => $default) foreach ($var_ary as $var => $default)
{ {
$data[$var] = (in_array($var, array('location', 'occupation', 'interests')) ? request_var($var, $default, true) : $data[$var] = request_var($var, $default); $data[$var] = (in_array($var, array('location', 'occupation', 'interests'))) ? request_var($var, $default, true) : $data[$var] = request_var($var, $default);
} }
$var_ary = array( $var_ary = array(

5
phpBB/includes/functions_template.php
View file

@ -259,7 +259,8 @@ class template_compile
if (strpos($tag_args, '!') === 0) if (strpos($tag_args, '!') === 0)
{ {
$no_nesting = substr_count($tag_args, '!', 0, strrpos($tag_args, '!') + 1); // Count the number if ! occurrences (not allowed in vars)
$no_nesting = substr_count($tag_args, '!');
$tag_args = substr($tag_args, $no_nesting); $tag_args = substr($tag_args, $no_nesting);
} }
@ -450,7 +451,7 @@ class template_compile
{ {
$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->_tpldata[\'.\'][0][\'' . $varrefs[3] . '\']'); $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->_tpldata[\'.\'][0][\'' . $varrefs[3] . '\']');
} }
else if (preg_match('#^\.([a-z0-9\-_]+\.?)+$#s', $token, $varrefs)) else if (preg_match('#^\.(([a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
{ {
$_tok = $this->generate_block_data_ref($varrefs[1], false); $_tok = $this->generate_block_data_ref($varrefs[1], false);
$token = "(isset($_tok) && sizeof($_tok))"; $token = "(isset($_tok) && sizeof($_tok))";