From 823df570222d5d913000985c1dce00be9668af55 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 19 Oct 2009 15:19:40 -0400 Subject: [PATCH] Make sure to convert charsets going to and from the storage driver. --- kronolith/lib/Driver/Resource.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kronolith/lib/Driver/Resource.php b/kronolith/lib/Driver/Resource.php index 6e614ace5..82c61c72d 100644 --- a/kronolith/lib/Driver/Resource.php +++ b/kronolith/lib/Driver/Resource.php @@ -66,7 +66,7 @@ class Kronolith_Driver_Resource extends Kronolith_Driver_Sql { if ($resource->getId()) { $query = 'UPDATE kronolith_resources SET resource_name = ?, resource_calendar = ?, resource_category = ? , resource_description = ?, resource_response_type = ?, resource_type = ?, resource_members = ? WHERE resource_id = ?'; - $values = array($resource->get('name'), $resource->get('calendar'), $resource->get('category'), $resource->get('description'), $resource->get('response_type'), $resource->get('type'), $resource->get('members'), $resource->getId()); + $values = array($this->convertToDriver($resource->get('name')), $resource->get('calendar'), $resource->get('category'), $this->convertToDriver($resource->get('description')), $resource->get('response_type'), $resource->get('type'), $resource->get('members'), $resource->getId()); $result = $this->_write_db->query($query, $values); if ($result instanceof PEAR_Error) { Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); @@ -76,7 +76,7 @@ class Kronolith_Driver_Resource extends Kronolith_Driver_Sql $query = 'INSERT INTO kronolith_resources (resource_id, resource_name, resource_calendar, resource_category, resource_description, resource_response_type, resource_type, resource_members)'; $cols_values = ' VALUES (?, ?, ?, ?, ?, ?, ?, ?)'; $id = $this->_db->nextId('kronolith_resources'); - $values = array($id, $resource->get('name'), $resource->get('calendar'), $resource->get('category'), $resource->get('description'), $resource->get('response_type'), $resource->get('type'), $resource->get('members')); + $values = array($id, $this->convertToDriver($resource->get('name')), $resource->get('calendar'), $resource->get('category'), $this->convertToDriver($resource->get('description')), $resource->get('response_type'), $resource->get('type'), $resource->get('members')); $result = $this->_write_db->query($query . $cols_values, $values); if ($result instanceof PEAR_Error) { Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR); @@ -221,7 +221,11 @@ class Kronolith_Driver_Resource extends Kronolith_Driver_Sql { $return = array(); foreach ($params as $field => $value) { - $return[str_replace('resource_', '', $field)] = $this->convertFromDriver($value); + if ($field == 'resource_name' || $field == 'resource_description') { + $return[str_replace('resource_', '', $field)] = $this->convertFromDriver($value); + } else { + $return[str_replace('resource_', '', $field)] = $value; + } } return $return; -- 2.11.0