From f3ce67e2bc98881bdc2fe1b2b0daa0152f6e3fd0 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 21 Oct 2010 17:21:56 -0400 Subject: [PATCH] H4 fixes for String:: and NLS:: --- framework/DataTree/DataTree/sql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/DataTree/DataTree/sql.php b/framework/DataTree/DataTree/sql.php index 9adf172db..a65a9736b 100644 --- a/framework/DataTree/DataTree/sql.php +++ b/framework/DataTree/DataTree/sql.php @@ -388,7 +388,7 @@ class DataTree_sql extends DataTree { $query = 'SELECT datatree_id FROM ' . $this->_params['table'] . ' WHERE group_uid = ? AND datatree_name = ? AND datatree_parents = ?'; - $object_name = String::convertCharset($object_name, NLS::getCharset(), $this->_params['charset']); + $object_name = Horde_String::convertCharset($object_name, 'UTF-8', $this->_params['charset']); $object_names = explode(':', $object_name); $object_parents = ''; foreach ($object_names as $name) { @@ -420,7 +420,7 @@ class DataTree_sql extends DataTree { . ' AND datatree_parents = ?'; $ids = array(); - $name = String::convertCharset($name, NLS::getCharset(), $this->_params['charset']); + $name = Horde_String::convertCharset($name, 'UTF-8', $this->_params['charset']); $parts = explode(':', $name); foreach ($parts as $part) { $result = $this->_db->getOne($query, array($this->_params['group'], $part, count($ids) ? ':' . implode(':', $ids) : '')); -- 2.11.0