beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Select converted fields only once

Browse source
This commit is contained in:
Jakub Vrana 2018-02-01 22:01:36 +01:00
parent fa41126c37
commit 0ebf710d41
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adminer/select.inc.php
View file

@ -260,13 +260,19 @@ if (!$columns && support("table")) {
$select2 = $select; $select2 = $select;
if (!$select2) { if (!$select2) {
$select2[] = "*"; $select2[] = "*";
$convert_fields = convert_fields($columns, $fields, $select);
if ($convert_fields) {
$select2[] = substr($convert_fields, 2);
}
if ($oid) { if ($oid) {
$select2[] = $oid; $select2[] = $oid;
} }
} }
$convert_fields = convert_fields($columns, $fields, $select); foreach ($select as $key => $val) {
if ($convert_fields) { $field = $fields[idf_unescape($val)];
$select2[] = substr($convert_fields, 2); if ($field && ($as = convert_field($field))) {
$select2[$key] = "$as AS $val";
}
} }
$result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true); $result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true);