As we don't use these includes at the moment they should be commented out too.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
index f06176d..b59407f 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
@@ -576,10 +576,10 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
     protected function &buildSearchQuery($criteria)
     {
         if (isset($criteria['field'])) {
-            require_once 'Horde/String.php';
-            require_once 'Horde/NLS.php';
             $rhs     = $criteria['test'];
             /* Keep this in for reference as we did not really test servers with different encoding yet */
+            // require_once 'Horde/String.php';
+            // require_once 'Horde/NLS.php';
             //$rhs     = String::convertCharset($criteria['test'], NLS::getCharset(), $this->params['charset']);
             switch ($criteria['op']) {
             case '=':