Merge branch 'MDL-26257-20' of git://github.com/bostelm/moodle into MOODLE_20_STABLE

2011-09-13 19:17:03 +08:00
parent 25c976527b 42d4cf091e
commit e2ea315c5b
1 changed files with 4 additions and 4 deletions
@@ -193,11 +193,11 @@ class auth_plugin_shibboleth extends auth_plugin_base {
     *
     */
    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