From: Jan Schneider Date: Wed, 17 Mar 2010 17:18:04 +0000 (+0100) Subject: Fix casting errors when using SQL shares and groups on PostgreSQL (Bug #8899). X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6c1bfbb2741e6788db1c8acdfe41e42d0830f212;p=horde.git Fix casting errors when using SQL shares and groups on PostgreSQL (Bug #8899). --- diff --git a/framework/Share/Share/sql.php b/framework/Share/Share/sql.php index b873899da..66f812ea3 100644 --- a/framework/Share/Share/sql.php +++ b/framework/Share/Share/sql.php @@ -718,7 +718,7 @@ class Horde_Share_sql extends Horde_Share { $ids = array_keys($groups); $group_ids = array(); foreach ($ids as $id) { - $group_ids[] = $this->_db->quote($id); + $group_ids[] = $this->_db->quote((string)$id); } $query .= ' LEFT JOIN ' . $this->_table . '_groups g ON g.share_id = s.share_id'; $where .= ' OR (g.group_uid IN (' . implode(',', $group_ids) . ')' diff --git a/framework/Share/Share/sql_hierarchical.php b/framework/Share/Share/sql_hierarchical.php index 0a0f262c8..727c0b472 100644 --- a/framework/Share/Share/sql_hierarchical.php +++ b/framework/Share/Share/sql_hierarchical.php @@ -218,7 +218,7 @@ class Horde_Share_sql_hierarchical extends Horde_Share_sql { $ids = array_keys($groups); $group_ids = array(); foreach ($ids as $id) { - $group_ids[] = $this->_db->quote($id); + $group_ids[] = $this->_db->quote((string)$id); } $query .= ' LEFT JOIN ' . $this->_table . '_groups AS g ON g.share_id = s.share_id'; $where .= ' OR (g.group_uid IN (' . implode(',', $group_ids) . ')' diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES index d21b3fb97..23eae81cb 100644 --- a/horde/docs/CHANGES +++ b/horde/docs/CHANGES @@ -37,6 +37,8 @@ v4.0-cvs v3.3.7-cvs ---------- +[jan] Fix casting errors when using SQL shares and groups on PostgreSQL + (Bug #8899). [gwr] Allow conf.d style directory configuration overriding (Request #8172). [jan] Fix sending alarms to multiple users (Bug #8821). [mms] Fix display of S/MIME certificate data (Bug #8826).