From 1922506ec408901422716729d32e018d302183d7 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 31 Aug 2009 16:44:56 +0200
Subject: [PATCH] More simplifying.

---
 kronolith/ajax.php          | 7 ++++---
 kronolith/lib/Api.php       | 7 ++++++-
 kronolith/lib/Kronolith.php | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/kronolith/ajax.php b/kronolith/ajax.php
index a8fc6afd1..40fac3a70 100644
--- a/kronolith/ajax.php
+++ b/kronolith/ajax.php
@@ -197,11 +197,12 @@ try {
 
     case 'QuickSaveEvent':
         $kronolith_driver = Kronolith::getDriver();
-        $uids = Kronolith::quickAdd(Horde_Util::getFormData('text'), Kronolith::getDefaultCalendar(PERMS_EDIT));
-        if (!count($uids)) {
+        $event = Kronolith::quickAdd(Horde_Util::getFormData('text'), Kronolith::getDefaultCalendar(PERMS_EDIT));
+        if (is_a($event, 'PEAR_Error')) {
+            $notification->push($event, 'horde.error');
+            $result = true;
             break;
         }
-        $event = $kronolith_driver->getByUid($uids[0]);
         $result = saveEvent($event);
         break;
 
diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php
index 8afafcdaf..4814bf277 100644
--- a/kronolith/lib/Api.php
+++ b/kronolith/lib/Api.php
@@ -690,7 +690,12 @@ class Kronolith_Api extends Horde_Registry_Api
             return PEAR::raiseError(_("Permission Denied"));
         }
 
-        return Kronolith::quickAdd($text, $calendar);
+        $event = Kronolith::quickAdd($text, $calendar);
+        if (is_a($event, 'PEAR_Error')) {
+            return $event;
+        }
+
+        return $event->getUID();
     }
 
     /**
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 83c97bbc8..2ac18cab3 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -654,7 +654,7 @@ class Kronolith
         if (is_a($eventId, 'PEAR_Error')) {
             return $eventId;
         }
-        return $event->getUID();
+        return $event;
     }
 
     /**
-- 
2.11.0