gunnar: server/patches/horde/framework-3.2-rc2 HK-GW-Share_fixes_framework-3.2-rc2.patch, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Thu Feb 21 13:01:00 CET 2008


Author: gunnar

Update of /kolabrepository/server/patches/horde/framework-3.2-rc2
In directory doto:/tmp/cvs-serv7707/framework-3.2-rc2

Added Files:
	HK-GW-Share_fixes_framework-3.2-rc2.patch 
Log Message:
The patch set for Horde-3.2-rc2 is complete. It still needs packaging and testing.

--- NEW FILE: HK-GW-Share_fixes_framework-3.2-rc2.patch ---
diff -r 99f100a93637 framework/Share/Share/kolab.php
--- a/framework/Share/Share/kolab.php	Thu Feb 21 10:56:14 2008 +0100
+++ b/framework/Share/Share/kolab.php	Thu Feb 21 11:24:50 2008 +0100
@@ -197,7 +197,7 @@ class Horde_Share_kolab extends Horde_Sh
             if (is_a($result, 'PEAR_Error')) {
                 return $result;
             }
-            $objects[$result->getId()] = &$result;
+            $objects[$result->getName()] = &$result;
         }
         return $objects;
     }
@@ -363,7 +363,7 @@ class Horde_Share_kolab extends Horde_Sh
             return $result;
         }
 
-        array_push($this->_shares, $share->getId());
+        array_push($this->_shares, $share->getName());
 
         if ($share->get('default')) {
             $this->_default = $share->get('folder');
@@ -377,7 +377,7 @@ class Horde_Share_kolab extends Horde_Sh
      */
     function _removeShare(&$share)
     {
-        $share_id = $share->getId();
+        $share_id = $share->getName();
         $folder = $share->get('folder');
         $result = $this->_imap->exists($folder);
         if (is_a($result, 'PEAR_Error')) {
@@ -748,20 +748,20 @@ class Horde_Share_Object_kolab extends H
      */
     function _getId()
     {
+        return $this->_getName();
+    }
+
+    /**
+     * Returns the name of this share.
+     *
+     * @return string  The share's name.
+     */
+    function _getName()
+    {
         if ($this->get('default')) {
             return $this->_shareOb->buildShareId(Auth::getAuth());
         }
         return $this->_shareOb->buildShareId(rawurlencode($this->get('folder')));
-    }
-
-    /**
-     * Returns the name of this share.
-     *
-     * @return string  The share's name.
-     */
-    function _getName()
-    {
-        return $this->get('folder');
     }
 
     /**





More information about the commits mailing list