Throw NotFound exceptions.

horde · Oct 29, 2013 · 323cb63 · 323cb63
1 parent ad21226
commit 323cb63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/kronolith/lib/Driver/Resource/Sql.php b/kronolith/lib/Driver/Resource/Sql.php
@@ -319,7 +319,7 @@ public function getResource($id)
             throw new Kronolith_Exception($e);
         }
         if (!count($results)) {
-            throw new Kronolith_Exception('Resource not found');
+            throw new Horde_Exception_NotFound('Resource not found');
         }
 
         $class = 'Kronolith_Resource_' . $results['resource_type'];
@@ -348,7 +348,7 @@ public function getResourceIdByCalendar($calendar)
             throw new Kronolith_Exception($e);
         }
         if (empty($result)) {
-            throw new Kronolith_Exception('Resource not found');
+            throw new Horde_Exception_NotFound('Resource not found');
         }
 
         return $result;

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
@@ -2801,8 +2801,11 @@ static public function displayedCalendars()
         if (!empty($GLOBALS['display_resource_calendars'])) {
             $r_driver = self::getDriver('Resource');
             foreach ($GLOBALS['display_resource_calendars'] as $c) {
-                $resource = $r_driver->getResource($r_driver->getResourceIdByCalendar($c));
-                $calendars[] = new Kronolith_Calendar_Resource(array('resource' => $resource));
+                try {
+                    $resource = $r_driver->getResource($r_driver->getResourceIdByCalendar($c));
+                    $calendars[] = new Kronolith_Calendar_Resource(array('resource' => $resource));
+                } catch (Horde_Exception_NotFound $e) {
+                }
             }
         }
         return $calendars;