Merge branch 'MDL-26257-21' of git://github.com/bostelm/moodle into M…

…OODLE_21_STABLE
moodle · Sep 13, 2011 · edb8077 · edb8077
2 parents d8f2500 + 033a066
commit edb8077
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
@@ -193,11 +193,11 @@ function loginpage_hook() {
      *
      */
     function logoutpage_hook() {
-        global $redirect;
+        global $SESSION, $redirect;
 
-        // Only do this if logout handler is defined
-        if (
-              isset($this->config->logout_handler)
+        // Only do this if logout handler is defined, and if the user is actually logged in via Shibboleth
+        if (  isset($SESSION->shibboleth_session_id)
+              && isset($this->config->logout_handler)
               && !empty($this->config->logout_handler)
            ){
             // Check if there is an alternative logout return url defined