- simplified iil_C_(Un)Subscribe() return value

git-svn-id: https://svn.roundcube.net/trunk@2884 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 9 deletions

diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 78d44860f..d904edb9b 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2890,7 +2890,7 @@ class rcube_imap
   private function _change_subscription($a_mboxes, $mode)
     {
     $updated = FALSE;
-    
+
     if (is_array($a_mboxes))
       foreach ($a_mboxes as $i => $mbox_name)
         {
@@ -2898,15 +2898,12 @@ class rcube_imap
         $a_mboxes[$i] = $mailbox;
 
         if ($mode=='subscribe')
-          $result = iil_C_Subscribe($this->conn, $mailbox);
+          $updated = iil_C_Subscribe($this->conn, $mailbox);
         else if ($mode=='unsubscribe')
-          $result = iil_C_UnSubscribe($this->conn, $mailbox);
-
-        if ($result>=0)
-          $updated = TRUE;
+          $updated = iil_C_UnSubscribe($this->conn, $mailbox);
         }
-        
-    // get cached mailbox list    
+
+    // get cached mailbox list
     if ($updated)
       {
       $a_mailbox_cache = $this->get_cache('mailboxes');
@@ -2918,7 +2915,7 @@ class rcube_imap
         $a_mailbox_cache = array_merge($a_mailbox_cache, $a_mboxes);
       else if ($mode=='unsubscribe')
         $a_mailbox_cache = array_diff($a_mailbox_cache, $a_mboxes);
-        
+
       // write mailboxlist to cache
       $this->update_cache('mailboxes', $this->_sort_mailbox_list($a_mailbox_cache));
       }