makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11031] Fix conversion of topic_replies to topic_posts

Browse source 
PHPBB3-11031
This commit is contained in:
Joas Schilling 2013-10-23 21:13:45 +02:00
parent 6dd4620609
commit 881ad935d5
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/install/convertors/convert_phpbb20.php
View file

@ -399,7 +399,7 @@ if (!$get_info)
array('is_orphan', 0, ''), array('is_orphan', 0, ''),
array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'), array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'),
array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'), array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'),
array('real_filename', 'attachments_desc.real_filename', ''), array('real_filename', 'attachments_desc.real_filename', 'phpbb_set_encoding'),
array('download_count', 'attachments_desc.download_count', ''), array('download_count', 'attachments_desc.download_count', ''),
array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')),
array('extension', 'attachments_desc.extension', ''), array('extension', 'attachments_desc.extension', ''),
@ -497,7 +497,7 @@ if (!$get_info)
array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'),
array('topic_time', 'topics.topic_time', ''), array('topic_time', 'topics.topic_time', ''),
array('topic_views', 'topics.topic_views', ''), array('topic_views', 'topics.topic_views', ''),
array('topic_posts_approved', 'topics.topic_replies + 1', ''), array('topic_posts_approved', 'topics.topic_replies', 'phpbb_topic_replies_to_posts'),
array('topic_posts_unapproved', 0, ''), array('topic_posts_unapproved', 0, ''),
array('topic_posts_softdeleted',0, ''), array('topic_posts_softdeleted',0, ''),
array('topic_last_post_id', 'topics.topic_last_post_id', ''), array('topic_last_post_id', 'topics.topic_last_post_id', ''),
@ -531,7 +531,7 @@ if (!$get_info)
array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'),
array('topic_time', 'topics.topic_time', ''), array('topic_time', 'topics.topic_time', ''),
array('topic_views', 'topics.topic_views', ''), array('topic_views', 'topics.topic_views', ''),
array('topic_posts_approved', 'topics.topic_replies + 1', ''), array('topic_posts_approved', 'topics.topic_replies', 'phpbb_topic_replies_to_posts'),
array('topic_posts_unapproved', 0, ''), array('topic_posts_unapproved', 0, ''),
array('topic_posts_softdeleted',0, ''), array('topic_posts_softdeleted',0, ''),
array('topic_last_post_id', 'topics.topic_last_post_id', ''), array('topic_last_post_id', 'topics.topic_last_post_id', ''),

9
phpBB/install/convertors/functions_phpbb20.php
View file

@ -540,6 +540,15 @@ function phpbb_user_id($user_id)
return (int) $user_id; return (int) $user_id;
} }
/**
* Return correct user id value
* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well
*/
function phpbb_topic_replies_to_posts($num_replies)
{
return (int) $num_replies + 1;
}
/* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example) /* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example)
function phpbb_copy_table_fields() function phpbb_copy_table_fields()
{ {