diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-10-22 17:21:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-10-22 17:21:56 +0200 |
| commit | 0a07635329b149ddf500f29f3363f2e9a94fb022 (patch) | |
| tree | e21dc6743686a413745149a05252b43da8f4c2c5 /phpBB | |
| parent | 90154db1dbe3cd24f5af82ad5f665d607aad97ed (diff) | |
| download | forums-0a07635329b149ddf500f29f3363f2e9a94fb022.tar forums-0a07635329b149ddf500f29f3363f2e9a94fb022.tar.gz forums-0a07635329b149ddf500f29f3363f2e9a94fb022.tar.bz2 forums-0a07635329b149ddf500f29f3363f2e9a94fb022.tar.xz forums-0a07635329b149ddf500f29f3363f2e9a94fb022.zip | |
[feature/soft-delete] Fix convertor and one mcp issue
PHPBB3-9567
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 10 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 3 | ||||
| -rw-r--r-- | phpBB/mcp.php | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 79c20b718d..9edfc9fd13 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -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', ''), diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 0b6daeef47..e2cbda3eeb 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -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' => '', diff --git a/phpBB/mcp.php b/phpBB/mcp.php index f13a6260fe..d322aacb2f 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -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; } |