Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #74 from marc1706/master

Browse Source 
Fix error if server-side topic marking is disabled
This commit is contained in:
Marc Alexander
2012-05-24 11:32:10 -07:00
parent be189babd4 0d6b235b87
commit 29ac558758
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
root/portal/includes/functions.php
View File

@@ -676,13 +676,6 @@ function get_portal_tracking_info($fetch_news)
if (sizeof($topic_ids))
{
$mark_time = array();
if ($global_announce_list && sizeof($global_announce_list))
{
if (isset($tracking_topics['f'][0]))
{
$mark_time[0] = base_convert($tracking_topics['f'][0], 36, 10) + $config['board_startdate'];
}
}
if (isset($tracking_topics['f'][$forum_id]))
{
@@ -693,14 +686,7 @@ function get_portal_tracking_info($fetch_news)
foreach ($topic_ids as $topic_id)
{
if ($global_announce_list && isset($global_announce_list[$topic_id]))
{
$last_read[$topic_id] = (isset($mark_time[0])) ? $mark_time[0] : $user_lastmark;
}
else
{
$last_read[$topic_id] = $user_lastmark;
}
$last_read[$topic_id] = $user_lastmark;
}
}
}