diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-25 16:03:40 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-25 16:03:40 +0000 |
| commit | 20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70 (patch) | |
| tree | 0b217a8cf2f6945baccdc3e3fefe572db41adecd /phpBB/install/install_convert.php | |
| parent | 17315b69c69fba5bad5f78bc1d38c301692f9904 (diff) | |
| download | forums-20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70.tar forums-20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70.tar.gz forums-20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70.tar.bz2 forums-20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70.tar.xz forums-20993d5cf1abdb448eb57c8b0de6c0f36bfc6f70.zip | |
Introduced checks to stop negative postcounts (Bug #11561, #11421)
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
Diffstat (limited to 'phpBB/install/install_convert.php')
| -rw-r--r-- | phpBB/install/install_convert.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 0ef32b1921..7c95c3ef05 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -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; |