Removes the GoogleApps account clean-up for dead people who did not had any.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 8a53e76..45666bb 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -74,8 +74,10 @@ function user_clear_all_subs($user_id, $really_del=true)
     // Deactivates, when available, the Google Apps account of the user.
     if ($globals->mailstorage->googleapps_domain) {
         require_once 'googleapps.inc.php';
-        $account = new GoogleAppsAccount($uid, $alias);
-        $account->suspend();
+        if (GoogleAppsAccount::account_status($uid)) {
+            $account = new GoogleAppsAccount($uid, $alias);
+            $account->suspend();
+        }
     }
 }