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

This commit is contained in:
Aparup Banerjee 2011-09-13 19:07:22 +08:00
commit 631c9c02ab

View file

@ -193,11 +193,11 @@ class auth_plugin_shibboleth extends auth_plugin_base {
* *
*/ */
function logoutpage_hook() { function logoutpage_hook() {
global $redirect; global $SESSION, $redirect;
// Only do this if logout handler is defined // Only do this if logout handler is defined, and if the user is actually logged in via Shibboleth
if ( if ( isset($SESSION->shibboleth_session_id)
isset($this->config->logout_handler) && isset($this->config->logout_handler)
&& !empty($this->config->logout_handler) && !empty($this->config->logout_handler)
){ ){
// Check if there is an alternative logout return url defined // Check if there is an alternative logout return url defined