From 7ebcfde1f90ad9c41d603ada10c1ef51567852e5 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 27 Jul 2010 19:14:18 -0400 Subject: [PATCH] MFB, don't use 'AS' in table aliases. Some of the changes from CVS were already present in Git, this is the remaining changes. Bug: 9151 --- framework/Share/lib/Horde/Share/Sql/Hierarchical.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Share/lib/Horde/Share/Sql/Hierarchical.php b/framework/Share/lib/Horde/Share/Sql/Hierarchical.php index 05c2717a3..b2351a0d2 100644 --- a/framework/Share/lib/Horde/Share/Sql/Hierarchical.php +++ b/framework/Share/lib/Horde/Share/Sql/Hierarchical.php @@ -208,7 +208,7 @@ class Horde_Share_Sql_Hierarchical extends Horde_Share_Sql $where .= ' OR (' . Horde_SQL::buildClause($this->_db, 's.perm_default', '&', $perm) . ')'; // (name == perm_users and key == $userid and val & $perm) - $query .= ' LEFT JOIN ' . $this->_table . '_users AS u ON u.share_id = s.share_id'; + $query .= ' LEFT JOIN ' . $this->_table . '_users u ON u.share_id = s.share_id'; $where .= ' OR ( u.user_uid = ' . $this->_write_db->quote($userid) . ' AND (' . Horde_SQL::buildClause($this->_db, 'u.perm', '&', $perm) . '))'; @@ -224,7 +224,7 @@ class Horde_Share_Sql_Hierarchical extends Horde_Share_Sql foreach ($ids as $id) { $group_ids[] = $this->_db->quote((string)$id); } - $query .= ' LEFT JOIN ' . $this->_table . '_groups AS g ON g.share_id = s.share_id'; + $query .= ' LEFT JOIN ' . $this->_table . '_groups g ON g.share_id = s.share_id'; $where .= ' OR (g.group_uid IN (' . implode(',', $group_ids) . ')' . ' AND (' . Horde_SQL::buildClause($this->_db, 'g.perm', '&', $perm) . '))'; } -- 2.11.0