From cfa28c4a77c3a8f6165f379a78823c848f1e5315 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Sun, 30 Aug 2015 21:31:55 +0200
Subject: [PATCH] Add a check in case the authentication authority specified in
 SimpleSAML_Auth_Default::initLogin() is not valid.

---
 lib/SimpleSAML/Auth/Default.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index 8298c4ddc..5dfa1b8f8 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -15,14 +15,16 @@ class SimpleSAML_Auth_Default {
 
 
 	/**
-	 * @deprecated This method will be removed in SSP 2.0.
+	 * @deprecated This method will be removed in SSP 2.0. Use SimpleSAML_Auth_Source::initLogin() instead.
 	 */
 	public static function initLogin($authId, $return, $errorURL = NULL,
 		array $params = array()) {
 
 		$as = SimpleSAML_Auth_Source::getById($authId);
+		if ($as !== null) {
 		$as->initLogin($return, $errorURL, $params);
 	}
+	}
 
 
 	/**
-- 
GitLab