aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors/convert_phpbb20.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-10-22 17:21:56 +0200
committerJoas Schilling <nickvergessen@gmx.de>2012-10-22 17:21:56 +0200
commit0a07635329b149ddf500f29f3363f2e9a94fb022 (patch)
treee21dc6743686a413745149a05252b43da8f4c2c5 /phpBB/install/convertors/convert_phpbb20.php
parent90154db1dbe3cd24f5af82ad5f665d607aad97ed (diff)
downloadforums-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/install/convertors/convert_phpbb20.php')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php10
1 files changed, 6 insertions, 4 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', ''),