diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-27 15:07:47 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-27 15:07:47 +0000 |
| commit | 9c0c1e14b6e56bd34d1b567bff65292aecac4f6f (patch) | |
| tree | d983791d64e67d803d93702cf5863a72a90d366c /phpBB/install/convertors/convert_phpbb20.php | |
| parent | 3ee5b28d3bf2bcfd88bfd5430ad04ca5daddd1b9 (diff) | |
| download | forums-9c0c1e14b6e56bd34d1b567bff65292aecac4f6f.tar forums-9c0c1e14b6e56bd34d1b567bff65292aecac4f6f.tar.gz forums-9c0c1e14b6e56bd34d1b567bff65292aecac4f6f.tar.bz2 forums-9c0c1e14b6e56bd34d1b567bff65292aecac4f6f.tar.xz forums-9c0c1e14b6e56bd34d1b567bff65292aecac4f6f.zip | |
Some fixes and improvements.
#11817
#11851
#11801
#11461
git-svn-id: file:///svn/phpbb/trunk@7692 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/convert_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 14ad45004d..a750c807d3 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -31,7 +31,7 @@ unset($dbpasswd); */ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', - 'version' => '0.92', + 'version' => '1.0.RC2-dev', 'phpbb_version' => '3.0.0', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'dbms' => $dbms, @@ -540,9 +540,7 @@ if (!$get_info) array('smiley_width', 'smilies.smile_url', 'get_smiley_width'), array('smiley_height', 'smilies.smile_url', 'get_smiley_height'), array('smiley_order', 'smilies.smilies_id', ''), - array('display_on_posting', 'smilies.smilies_id', array( - 'execute' => '{RESULT} = ({VALUE}[0] <= 20) ? 1 : 0;', - )), + array('display_on_posting', 'smilies.smilies_id', 'get_smiley_display'), 'order_by' => 'smilies.smilies_id ASC', ), @@ -714,8 +712,8 @@ if (!$get_info) array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), + array('pm_new', 0, ''), + array('pm_unread', 0, ''), array('pm_replied', 0, ''), array('pm_marked', 0, ''), array('pm_forwarded', 0, ''), |