- Patch #851748 by Stevel: weird logic in SelectQuery::addField().

1 files changed, 2 insertions, 2 deletions

diff --git a/includes/database/select.inc b/includes/database/select.inc
index 1777a20d4..535c29c85 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -1125,14 +1125,14 @@ class SelectQuery extends Query implements SelectQueryInterface {
     }
 
     // If that's already in use, try the table name and field name.
-    if (!empty($this->tables[$alias])) {
+    if (!empty($this->fields[$alias])) {
       $alias = $table_alias . '_' . $field;
     }
 
     // If that is already used, just add a counter until we find an unused alias.
     $alias_candidate = $alias;
     $count = 2;
-    while (!empty($this->tables[$alias_candidate])) {
+    while (!empty($this->fields[$alias_candidate])) {
       $alias_candidate = $alias . '_' . $count++;
     }
     $alias = $alias_candidate;