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

Some... fixes... laying around here.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6970 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-02-06 19:09:43 +00:00
parent 10f775cb1c
commit 333b3515ed
11 changed files with 115 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/includes/mcp/mcp_forum.php
View File

@@ -117,6 +117,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
ORDER BY t.topic_type DESC, $sort_order_sql";
$result = $db->sql_query_limit($sql, $topics_per_page, $start);
$topic_list = $topic_tracking_info = array();
while ($row = $db->sql_fetchrow($result))
{
$topic_rows[$row['topic_id']] = $row;
@@ -124,15 +125,23 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
}
$db->sql_freeresult($result);
$topic_tracking_info = array();
// Get topic tracking info
if ($config['load_db_lastread'])
// If there is more than one page, but we have no topic list, then the start parameter is... erm... out of sync
if (!sizeof($topic_list) && $forum_topics && $start > 0)
{
$topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $topic_rows, array($forum_id => $forum_info['mark_time']), array());
redirect($url . "&i=$id&action=$action&mode=$mode");
}
else
// Get topic tracking info
if (sizeof($topic_list))
{
$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, array());
if ($config['load_db_lastread'])
{
$topic_tracking_info = get_topic_tracking($forum_id, $topic_list, $topic_rows, array($forum_id => $forum_info['mark_time']), array());
}
else
{
$topic_tracking_info = get_complete_topic_tracking($forum_id, $topic_list, array());
}
}
foreach ($topic_rows as $topic_id => $row)

6
phpBB/includes/mcp/mcp_reports.php
View File

@@ -192,7 +192,7 @@ class mcp_reports
$forum_info = array();
$forum_list_reports = get_forum_list('m_report', false, true);
if ($topic_id)
if ($topic_id && $forum_id)
{
$topic_info = get_topic_data(array($topic_id));
@@ -204,6 +204,10 @@ class mcp_reports
$topic_info = $topic_info[$topic_id];
$forum_id = $topic_info['forum_id'];
}
else if ($topic_id && !$forum_id)
{
$topic_id = 0;
}
$forum_list = array();