diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-02-13 16:28:37 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-02-13 16:28:37 +0000 |
| commit | d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1 (patch) | |
| tree | 522d22fa5bfe582f1ad18aabe3df62e8dc71c7da /phpBB/install/convertors | |
| parent | bd31cb634d545edb0cf17e58962004d6830f3537 (diff) | |
| download | forums-d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1.tar forums-d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1.tar.gz forums-d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1.tar.bz2 forums-d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1.tar.xz forums-d7c5f502b4e0ef87a1d4a8d9a4fc16c79b3a5dc1.zip | |
Fixing converter bugs.
#21215
#18575
#18435
#16565
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8379 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 6 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 16b500d8d5..4fe59d5a0a 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -482,14 +482,16 @@ if (!$get_info) array('topic_moved_id', 0, ''), array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), array('topic_first_post_id', 'topics.topic_first_post_id', ''), - + array('topic_last_view_time', 'posts.post_time', ''), array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), array('poll_max_options', 1, ''), array('poll_vote_change', 0, ''), - 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', + 'left_join' => array ( 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', + 'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id', + ), 'where' => 'topics.topic_moved_id = 0', ), diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 1f62d80852..c4d421efee 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -455,7 +455,7 @@ function phpbb_get_birthday($birthday = '') { $birthday = (int) $birthday; - if (!$birthday || $birthday == 999999 || $birthday < 0) + if (!$birthday || $birthday == 999999 || ((version_compare(PHP_VERSION, '5.1.0') < 0) && $birthday < 0)) { return ' 0- 0- 0'; } |