From b74600a75946c09159d02f39dfe807ee892cdf71 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 26 Sep 2011 21:16:30 -0300
Subject: Making muamba_get_transactions() work for all status

---
 muamba.db.inc | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'muamba.db.inc')

diff --git a/muamba.db.inc b/muamba.db.inc
index bd2322f..0e29ca6 100644
--- a/muamba.db.inc
+++ b/muamba.db.inc
@@ -52,21 +52,20 @@ function muamba_check_user_request($nid, $uid) {
  * @return
  *   Array of existing transactions.
  */
-function muamba_get_transactions($uid, $type = 'sent', $status = MUAMBA_REQUESTED) {
+function muamba_get_transactions($uid, $type = 'sent', $status = NULL) {
   $uid   = (int) $uid;
   $query = db_select('muamba', 'm');
+  $query->fields('m', array('mid', 'nid', 'uid', 'owner', 'status', 'thread_id'));
 
   if ($type == 'sent') {
-    $query
-      ->condition('m.uid', $uid, '=')
-      ->condition('m.status', $status, '=')
-      ->fields('m', array('mid', 'nid', 'uid', 'owner', 'thread_id'));
+    $query->condition('m.uid', $uid, '=');
   }
   else {
-    $query
-      ->condition('m.owner', $uid, '=')
-      ->condition('m.status', $status, '=')
-      ->fields('m', array('mid', 'nid', 'uid', 'owner', 'status', 'thread_id'));
+    $query->condition('m.owner', $uid, '=');
+  }
+
+  if ($status != NULL) {
+    $query->condition('m.status', $status, '=');
   }
 
   $rows    = array();
-- 
cgit v1.2.3