From: skodak <skodak>
Date: Sun, 25 Mar 2007 20:20:45 +0000 (+0000)
Subject: MDL-9028 prelogout_hook() is never executed in login/logout.php; patch by Inaki Arena... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=52a1b558e3c19ff64fbd38ed6e3f4bc19b57fb50;p=moodle.git

MDL-9028 prelogout_hook() is never executed in login/logout.php; patch by Inaki Arenaza; merged from MOODLE_18_STABLE
---

diff --git a/login/logout.php b/login/logout.php
index 41c3039aba..4b7abf69d5 100644
--- a/login/logout.php
+++ b/login/logout.php
@@ -6,12 +6,6 @@
     // can be overriden by auth plugins
     $redirect = $CFG->wwwroot.'/';
 
-    $authsequence = explode(',', $CFG->auth); // auths, in sequence
-    foreach($authsequence as $authname) {
-        $authplugin = get_auth_plugin($authname);
-        $authplugin->prelogin_hook();
-    }
-
     $sesskey = optional_param('sesskey', '__notpresent__', PARAM_RAW); // we want not null default to prevent required sesskey warning
 
     if (!confirm_sesskey($sesskey)) {
@@ -21,6 +15,12 @@
         die;
     }
 
+    $authsequence = explode(',', $CFG->auth); // auths, in sequence
+    foreach($authsequence as $authname) {
+        $authplugin = get_auth_plugin($authname);
+        $authplugin->prelogout_hook();
+    }
+
     require_logout();
 
     redirect($redirect);