Permalink
Browse files

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

…OODLE_20_STABLE
  • Loading branch information...
2 parents 25c9765 + 42d4cf0 commit e2ea315c5bb0a5e107614ad2ec4513212f756955 @nebgor nebgor committed Sep 13, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 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

0 comments on commit e2ea315

Please sign in to comment.