Do not return an error if there are no threads. Just an empty array.

jrmadsen67 · Sep 27, 2013 · 10c5e82 · 10c5e82
1 parent b5581ee
commit 10c5e82
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/application/libraries/Mahana_messaging.php b/application/libraries/Mahana_messaging.php
@@ -111,7 +111,8 @@ function get_all_threads($user_id, $full_thread = FALSE, $order_by = 'ASC')
             return $this->_invalid_id(MSG_ERR_INVALID_USER_ID);
         }
 
-        if ($message = $this->ci->mahana_model->get_all_threads($user_id, $full_thread, $order_by))
+		$message = $this->ci->mahana_model->get_all_threads($user_id, $full_thread, $order_by);
+        if (is_array($message))
         {
             return $this->_success($message);
         }
@@ -138,7 +139,8 @@ function get_all_threads_grouped($user_id, $full_thread = FALSE, $order_by = 'AS
             return $this->_invalid_id(MSG_ERR_INVALID_USER_ID);
         }
 
-        if ($message = $this->ci->mahana_model->get_all_threads($user_id, $full_thread, $order_by))
+		$message = $this->ci->mahana_model->get_all_threads($user_id, $full_thread, $order_by);
+        if (is_array($message))
         {
             $threads = array();