mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Some fixes and improvements.

Browse Source 
#11817
#11851
#11801
#11461


git-svn-id: file:///svn/phpbb/trunk@7692 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2007-05-27 15:07:47 +00:00
parent 3ee5b28d3b
commit 9c0c1e14b6
8 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/convertors/convert_phpbb20.php
View File

@@ -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, ''),

2
phpBB/install/install_convert.php
View File

@@ -1162,6 +1162,8 @@ class install_convert extends module
$schema['group_by'] = array($schema['group_by']);
foreach($sql_data['select_fields'] as $select)
{
$alias = strpos(strtolower($select), ' as ');
$select = ($alias) ? substr($select, 0, $alias) : $select;
if (!in_array($select, $schema['group_by']))
{
$schema['group_by'][] = $select;