Catch and throw errors

horde · Sep 2, 2014 · 7eeb857 · 7eeb857
1 parent a45d044
commit 7eeb857
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/jonah/lib/Driver/Sql.php b/jonah/lib/Driver/Sql.php
@@ -457,15 +457,19 @@ protected function _getStories($criteria, $order = Jonah::ORDER_PUBLISHED)
         if ($limit || $start != 0) {
             $results = array();
             $rows = $this->_db->limitQuery($sql, $start, $limit, $values);
+            if ($rows instanceof PEAR_Error) {
+                throw new Jonah_Exception($rows);
+            }
             while ($rows->fetchInto($row, DB_FETCHMODE_ASSOC)) {
                 $results[] = $row;
             }
         } else {
             $results = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
+            if ($results instanceof PEAR_Error) {
+                throw new Jonah_Exception($results);
+            }
         }
-        if ($results instanceof PEAR_Error) {
-            throw new Jonah_Exception($results);
-        }
+
         foreach ($results as &$row) {
             $row['tags'] = $this->readTags($row['id']);
         }