diff --git a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php index bc75aeab4051220918e5e9b5955dbedca9abad0a..08c47aedbdd997c9f27577f66e8714085deb2804 100644 --- a/lib/SimpleSAML/IdP/IFrameLogoutHandler.php +++ b/lib/SimpleSAML/IdP/IFrameLogoutHandler.php @@ -95,7 +95,9 @@ class IFrameLogoutHandler implements LogoutHandlerInterface $t = new \SimpleSAML\XHTML\Template($config, 'IFrameLogoutHandler.twig'); $t->data['assocId'] = var_export($assocId, true); $t->data['spId'] = sha1($assocId); - $t->data['errorMsg'] = $error->getMessage(); + if (!is_null($error)) { + $t->data['errorMsg'] = $error->getMessage(); + } $t->show(); exit(0); } diff --git a/templates/IFrameLogoutHandler.twig b/templates/IFrameLogoutHandler.twig index 2706636e0383e8bbb92561a1c82460c86e4c2690..ad4d4a69856df57610541a23844c1d6f8046f667 100644 --- a/templates/IFrameLogoutHandler.twig +++ b/templates/IFrameLogoutHandler.twig @@ -3,7 +3,7 @@ <head> <title>Logout response from {{ assocId|escape('html') }}</title> <script> -{% if error %} +{% if errorMsg is defined %} window.parent.logoutFailed("{{ spId }}", "{{ errorMsg|escape }}"); {% else %} window.parent.logoutCompleted("{{ spId }}");