Merge branch '2014.11' into 2015.11

[tine20] / tine20 / Admin / Controller / User.php

diff --git a/tine20/Admin/Controller/User.php b/tine20/Admin/Controller/User.php
index d50f20c..c513ecd 100644 (file)
--- a/tine20/Admin/Controller/User.php
+++ b/tine20/Admin/Controller/User.php
@@ -125,7 +125,7 @@ class Admin_Controller_User extends Tinebase_Controller_Abstract
      *
      * @param   string $_accountId  account id
      * @param   string $_status     status to set
      *
      * @param   string $_accountId  account id
      * @param   string $_status     status to set

-     * @return  array with success flag
+     * @return  int

      */
     public function setAccountStatus($_accountId, $_status)
     {
      */
     public function setAccountStatus($_accountId, $_status)
     {


@@ -385,10 +385,6 @@ class Admin_Controller_User extends Tinebase_Controller_Abstract
                 $groupsController->removeGroupMember($groupId, $accountId);
             }
             
                 $groupsController->removeGroupMember($groupId, $accountId);
             }
             

-            if (Tinebase_Application::getInstance()->isInstalled('Addressbook') === true && !empty($oldUser->contact_id)) {
-                $this->_deleteContact($oldUser->contact_id);
-            }
-            

             $this->_userBackend->deleteUser($accountId);
         }
     }
             $this->_userBackend->deleteUser($accountId);
         }
     }


@@ -480,16 +476,4 @@ class Admin_Controller_User extends Tinebase_Controller_Abstract
         
         return $contact;
     }
         
         return $contact;
     }

-    
-    /**
-     * delete contact associated with user
-     * 
-     * @param string  $_contactId
-     */
-    protected function _deleteContact($_contactId)
-    {
-        $contactsBackend = Addressbook_Backend_Factory::factory(Addressbook_Backend_Factory::SQL);
-        
-        $contactsBackend->delete($_contactId);
-    }

 }
 }