Fix typos.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php
index 317b839..0484805 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php
@@ -65,7 +65,7 @@ implements Horde_Kolab_Server_Object_Interface
      */
     public function getGuid()
     {
-        if (empty($this->guid)) {
+        if ($this->guid === null) {
             throw new Horde_Kolab_Server_Exception(
                 'Uninitialized object is missing GUID!'
             );

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php
index 6d58d60..5624c11 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php
@@ -71,16 +71,16 @@ implements Horde_Kolab_Server_Objects_Interface
      * If you do not specify a uid the object corresponding to the user bound to
      * the server will be returned.
      *
-     * @param string $uid  The UID of the object to fetch.
+     * @param string $guid The GUID of the object to fetch.
      * @param string $type The type of the object to fetch.
      *
      * @return Kolab_Object The corresponding Kolab object.
      *
      * @throws Horde_Kolab_Server_Exception
      */
-    public function fetch($uid = null, $type = null)
+    public function fetch($guid = null, $type = null)
     {
-        if (!isset($uid)) {
+        if (!isset($guid)) {
             $guid = $this->_composite->server->getGuid();
         }
         if (empty($type)) {