Changing muamba_availability_info() behavior due to new muamba_check_availability...

diff --git a/muamba.business.inc b/muamba.business.inc
index a29566728f86971fc998a585f7295abb3223dddf..9aea8eed8e32f1789210a2beb17496ad82c59ca3 100644 (file)
--- a/muamba.business.inc
+++ b/muamba.business.inc
@@ -447,8 +447,7 @@ function muamba_widget($node, $size = 'small') {
  */
 function muamba_availability_info($nid) {
   global $user;
-  $available = muamba_check_availability($nid);
-  $node      = node_load($nid);
+  $node = node_load($nid);
 
   if ($node->uid == $user->uid) {
     $transactions = muamba_current_transactions($nid);
@@ -472,12 +471,11 @@ function muamba_availability_info($nid) {
   }
   else {
     $transaction = muamba_current_transactions($nid, $user->uid);
+    $available   = muamba_check_availability($nid, $user->uid);
 
     if (!$available) {
       if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) {
-        return t('You requested, status is @status', array(
-          '@status' => t(muamba_statuses($transaction['status'])),
-        ));
+        return t('You requested, but it is not available');
       }
       else {
         return t('No');
@@ -485,7 +483,9 @@ function muamba_availability_info($nid) {
     }
     else {
       if (isset($transaction['uid']) && $transaction['uid'] == $user->uid) {
-        return t('Yes, you requested');
+        return t('Yes, you requested, status is @status', array(
+           '@status' => t(muamba_statuses($transaction['status'])),
+         ));
       }
       else {
         return t('Yes');

diff --git a/muamba.db.inc b/muamba.db.inc
index 1c1894e7e6df0f2d1abab070d4d9dcc5b40e9ad5..e24492b01799fd3ccfda146deee7f1027d873749 100644 (file)
--- a/muamba.db.inc
+++ b/muamba.db.inc
@@ -199,7 +199,7 @@ function muamba_check_availability($data, $uid = NULL) {
   if (empty($current)) {
     return TRUE;
   }
-  elseif ($uid !== NULL && $current['uid'] == $user->uid) {
+  elseif ($uid !== NULL && $current[0]->uid == $user->uid) {
     return TRUE;
   }