From f2bb9679dfeebae4f2e2631f04e6951c57a89124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Thu, 31 Mar 2011 11:39:46 +0000
Subject: [PATCH] do not override discourl in authsources config...
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2784 44740490-163a-0410-bde0-09ae8108e29a
---
modules/saml/lib/Auth/Source/SP.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 6edbc3e04..5155d4844 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -59,7 +59,7 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
$this->idp = $this->metadata->getString('idp', NULL);
$this->discoURL = $this->metadata->getString('discoURL', NULL);
- if (SimpleSAML_Module::isModuleEnabled('discojuice')) {
+ if (empty($this->discoURL) && SimpleSAML_Module::isModuleEnabled('discojuice')) {
$this->discoURL = SimpleSAML_Module::getModuleURL('discojuice/central.php');
}
}
--
GitLab