From c29035059732cc71de9dc98599b6fa95893b9953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 4 Apr 2011 06:39:12 +0000
Subject: [PATCH] Do not overwrite options.disco parameter if already set
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2797 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/lib/EmbedHelper.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/discojuice/lib/EmbedHelper.php b/modules/discojuice/lib/EmbedHelper.php
index 490befd4c..c372e376a 100644
--- a/modules/discojuice/lib/EmbedHelper.php
+++ b/modules/discojuice/lib/EmbedHelper.php
@@ -41,7 +41,11 @@ class sspmod_discojuice_EmbedHelper {
echo 'options.countryAPI = "' . SimpleSAML_Module::getModuleURL('discojuice/country.php'). '"; ' . "\n";
echo 'options.metadata = "' . SimpleSAML_Module::getModuleURL('discojuice/feed.php'). '"; ' . "\n";
- echo 'options.disco = { url: "' . SimpleSAML_Module::getModuleURL('discojuice/discojuiceDiscoveryResponse.html?'). '" }; ' . "\n";
+ if (!empty($options['disco'])) {
+ echo 'options.disco.url = "' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/discojuiceDiscoveryResponse.html?'). '"; ' . "\n";
+ }
+
+
echo 'options.discoPath = "' . SimpleSAML_Module::getModuleURL('discojuice/discojuice/') . '"; ' . "\n";
--
GitLab