From 71741ee039a6cc4a40b17b9a27120a55dfde7722 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Wed, 4 May 2011 22:38:10 +0200
Subject: [PATCH] Allows to disable googleapps when googleapps email
 redirection is not currently active.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 modules/googleapps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/googleapps.php b/modules/googleapps.php
index e02c253..72519bb 100644
--- a/modules/googleapps.php
+++ b/modules/googleapps.php
@@ -83,7 +83,7 @@ class GoogleAppsModule extends PLModule
                 if ($account->pending_update_suspension) {
                     $page->trigWarning("Ton compte est déjà en cours de désactivation.");
                 } else {
-                    if ($redirect->modify_one_email('googleapps', false) == SUCCESS) {
+                    if (!$redirect_active || $redirect->modify_one_email('googleapps', false) == SUCCESS) {
                         $account->suspend();
                         $page->trigSuccess("Ton compte Google Apps est dorénavant désactivé.");
                     } else {
-- 
2.1.4