projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a6943f
)
MFB: Need charset conversion here too (Bug #9323).
author
Jan Schneider
<jan@horde.org>
Thu, 21 Oct 2010 20:15:35 +0000
(22:15 +0200)
committer
Jan Schneider
<jan@horde.org>
Thu, 21 Oct 2010 20:18:40 +0000
(22:18 +0200)
framework/DataTree/DataTree/sql.php
patch
|
blob
|
history
diff --git
a/framework/DataTree/DataTree/sql.php
b/framework/DataTree/DataTree/sql.php
index
e1831c5
..
9adf172
100644
(file)
--- a/
framework/DataTree/DataTree/sql.php
+++ b/
framework/DataTree/DataTree/sql.php
@@
-420,6
+420,7
@@
class DataTree_sql extends DataTree {
. ' AND datatree_parents = ?';
$ids = array();
+ $name = String::convertCharset($name, NLS::getCharset(), $this->_params['charset']);
$parts = explode(':', $name);
foreach ($parts as $part) {
$result = $this->_db->getOne($query, array($this->_params['group'], $part, count($ids) ? ':' . implode(':', $ids) : ''));