backport

Patches applied:

 * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-9
   stupid bug

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-160

diff --git a/htdocs/emails/redirect.php b/htdocs/emails/redirect.php
index 246d748..a7b6b2d 100644 (file)
--- a/htdocs/emails/redirect.php
+++ b/htdocs/emails/redirect.php
@@ -29,13 +29,12 @@ $forlife = Session::get('forlife');
 $redirect = new Redirect(Session::getInt('uid'));
 
 if (Env::has('emailop')) {
+    $actifs = Env::getMixed('emails_actifs', Array());
     if (Env::get('emailop') == "retirer" && Env::has('email')) {
         $page->assign('retour', $redirect->delete_email(Env::get('email')));
     } elseif (Env::get('emailop') == "ajouter" && Env::has('email')) {
         $page->assign('retour', $redirect->add_email(trim(Env::get('email'))));
-    }
-    $actifs = Env::getMixed('emails_actifs', Array());
-    if (empty($actifs)) {
+    } elseif (empty($actifs)) {
         $page->assign('retour', ERROR_INACTIVE_REDIRECTION);
     } elseif (is_array($actifs)) {
         $page->assign('retour', $redirect->modify_email($actifs, Env::getMixed('emails_rewrite',Array())));