mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
More bugfixes
git-svn-id: file:///svn/phpbb/trunk@2951 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c677640b64
commit
58ddae0c90
3 changed files with 120 additions and 124 deletions
|
@ -22,6 +22,11 @@
|
||||||
foreach ($forum_rows as $row)
|
foreach ($forum_rows as $row)
|
||||||
{
|
{
|
||||||
extract($row);
|
extract($row);
|
||||||
|
if (!$auth->acl_get('f_list', $forum_id))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if ($parent_id == $root_id)
|
if ($parent_id == $root_id)
|
||||||
{
|
{
|
||||||
if ($forum_status == ITEM_CATEGORY)
|
if ($forum_status == ITEM_CATEGORY)
|
||||||
|
@ -45,8 +50,6 @@ foreach ($forum_rows as $row)
|
||||||
unset($stored_cat);
|
unset($stored_cat);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($auth->acl_get('f_list', $forum_id))
|
|
||||||
{
|
|
||||||
switch ($forum_status)
|
switch ($forum_status)
|
||||||
{
|
{
|
||||||
case ITEM_CATEGORY:
|
case ITEM_CATEGORY:
|
||||||
|
@ -172,6 +175,5 @@ foreach ($forum_rows as $row)
|
||||||
|
|
||||||
'U_VIEWFORUM' => $forum_link
|
'U_VIEWFORUM' => $forum_link
|
||||||
));
|
));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
|
@ -44,8 +44,9 @@ if (defined('DEBUG'))
|
||||||
|
|
||||||
if ($auth->acl_get('a_'))
|
if ($auth->acl_get('a_'))
|
||||||
{
|
{
|
||||||
$debug_output .= ' | <a href="' . $_SERVER['REQUEST_URI'] . '&explain=1">Explain</a> ]';
|
$debug_output .= ' | <a href="' . $_SERVER['REQUEST_URI'] . '&explain=1">Explain</a>';
|
||||||
}
|
}
|
||||||
|
$debug_output .= ' ]';
|
||||||
}
|
}
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
|
|
|
@ -167,13 +167,6 @@ class Template {
|
||||||
*/
|
*/
|
||||||
function display($handle)
|
function display($handle)
|
||||||
{
|
{
|
||||||
if (!empty($_REQUEST['explain']))
|
|
||||||
{
|
|
||||||
global $db;
|
|
||||||
echo $db->sql_report;
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
$_str = '';
|
$_str = '';
|
||||||
|
|
||||||
if (!$this->compile_load($_str, $handle, true))
|
if (!$this->compile_load($_str, $handle, true))
|
||||||
|
|
Loading…
Add table
Reference in a new issue