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

[feature/soft-delete] Fix convertor and one mcp issue

Browse Source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-22 17:21:56 +02:00
parent 90154db1db
commit 0a07635329
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/convertors/convert_phpbb20.php
View File

@ -495,8 +495,9 @@ if (!$get_info)
array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'),
array('topic_time', 'topics.topic_time', ''),
array('topic_views', 'topics.topic_views', ''),
array('topic_replies', 'topics.topic_replies', ''),
array('topic_replies_real', 'topics.topic_replies', ''),
array('topic_posts', 'topics.topic_replies + 1', ''),
array('topic_posts_unapproved', 0, ''),
array('topic_posts_softdeleted',0, ''),
array('topic_last_post_id', 'topics.topic_last_post_id', ''),
array('topic_status', 'topics.topic_status', 'is_topic_locked'),
array('topic_moved_id', 0, ''),
@ -528,8 +529,9 @@ if (!$get_info)
array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'),
array('topic_time', 'topics.topic_time', ''),
array('topic_views', 'topics.topic_views', ''),
array('topic_replies', 'topics.topic_replies', ''),
array('topic_replies_real', 'topics.topic_replies', ''),
array('topic_posts', 'topics.topic_replies + 1', ''),
array('topic_posts_unapproved', 0, ''),
array('topic_posts_softdeleted',0, ''),
array('topic_last_post_id', 'topics.topic_last_post_id', ''),
array('topic_status', ITEM_MOVED, ''),
array('topic_moved_id', 'topics.topic_moved_id', ''),

3
phpBB/install/convertors/functions_phpbb20.php
View File

@ -245,7 +245,8 @@ function phpbb_insert_forums()
'forum_topics_per_page' => 0,
'forum_posts' => 0,
'forum_topics' => 0,
'forum_topics_real' => 0,
'forum_topics_unapproved' => 0,
'forum_topics_softdeleted' => 0,
'forum_last_post_id' => 0,
'forum_last_poster_id' => 0,
'forum_last_post_subject' => '',

5
phpBB/mcp.php
View File

@ -538,10 +538,7 @@ function get_forum_data($forum_id, $acl_list = 'f_list', $read_tracking = false)
continue;
}
if ($auth->acl_get('m_approve', $row['forum_id']))
{
$row['forum_topics'] = $row['forum_topics_real'];
}
$row['forum_topics'] = phpbb_content_visibility::get_count('forum_topics', $row, $row['forum_id']);
$rowset[$row['forum_id']] = $row;
}