From 1778615ac53cc10e1b4f718cc5cc74433417f1a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Fri, 8 Mar 2019 16:44:57 +0100
Subject: [PATCH] Fix all metadata endpoints to use the template now located in
 the "saml" module.

---
 modules/adfs/www/idp/metadata.php | 2 +-
 www/saml2/idp/metadata.php        | 2 +-
 www/shib13/idp/metadata.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index 473af96dc..0f7dce545 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -143,7 +143,7 @@ try {
     if ($output_xhtml) {
         $defaultidp = $config->getString('default-adfs-idp', null);
 
-        $t = new \SimpleSAML\XHTML\Template($config, 'metadata.php', 'admin');
+        $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 984fb9252..1fce62b9d 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -214,7 +214,7 @@ try {
     if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
         $defaultidp = $config->getString('default-saml20-idp', null);
 
-        $t = new \SimpleSAML\XHTML\Template($config, 'metadata.php', 'admin');
+        $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
 
         $t->data['clipboard.js'] = true;
         $t->data['available_certs'] = $availableCerts;
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index acd5ee33a..d1f012e19 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -84,7 +84,7 @@ try {
     if (array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml') {
         $defaultidp = $config->getString('default-shib13-idp', null);
 
-        $t = new \SimpleSAML\XHTML\Template($config, 'metadata.php', 'admin');
+        $t = new \SimpleSAML\XHTML\Template($config, 'saml:metadata.php', 'admin');
 
         $t->data['clipboard.js'] = true;
         $t->data['header'] = 'shib13-idp'; // TODO: Replace with headerString in 2.0
-- 
GitLab