mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Introduced checks to stop negative postcounts (Bug #11561, #11421)

Browse Source 
Allow IP v4/v6 urls for remote avatars (Bug #11633)
 Delete avatar files automatically (Bug #11631)
 Automatically add selected columsn to group by statements in the converter (Bug #11465)


git-svn-id: file:///svn/phpbb/trunk@7677 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2007-05-25 16:03:40 +00:00
parent 17315b69c6
commit 20993d5cf1
6 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/install/install_convert.php
View File

@@ -1157,7 +1157,18 @@ class install_convert extends module
$sql .= (!empty($schema['where'])) ? "\nWHERE (" . $schema['where'] . ')' : '';
// Group By
$sql .= (!empty($schema['group_by'])) ? "\nGROUP BY " . $schema['group_by'] : '';
if (!empty($schema['group_by']))
{
$schema['group_by'] = array($schema['group_by']);
foreach($sql_data['select_fields'] as $select)
{
if (!in_array($select, $schema['group_by']))
{
$schema['group_by'][] = $select;
}
}
}
$sql .= (!empty($schema['group_by'])) ? "\nGROUP BY " . implode(', ', $schema['group_by']) : '';
// Having
$sql .= (!empty($schema['having'])) ? "\nHAVING " . $schema['having'] : '';
@@ -1168,7 +1179,7 @@ class install_convert extends module
$schema['order_by'] = $schema['primary'];
}
$sql .= (!empty($schema['order_by'])) ? "\nORDER BY " . $schema['order_by'] : '';
// Counting basically holds the amount of rows processed.
$counting = -1;
$batch_time = 0;