From d0efbed558881d1650577ce22759999e42cfac1a Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Mon, 6 Oct 2014 15:09:34 +0200
Subject: [PATCH] Remove code that's no longer necessary.
---
templates/selectidp-dropdown.php | 8 +-------
templates/selectidp-links.php | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/templates/selectidp-dropdown.php b/templates/selectidp-dropdown.php
index 27fbc36e7..7b0f531b5 100644
--- a/templates/selectidp-dropdown.php
+++ b/templates/selectidp-dropdown.php
@@ -10,13 +10,7 @@ $this->data['autofocus'] = 'dropdownlist';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (!empty($idpentry['UIInfo']['DisplayName'])) {
- /* TODO: remove this branch, If ['UIInfo']['DisplayName'] is available, it will get through to 'name' in the
- * metadata parsed with SSP >= 1.13.0, so this code is no longer necessary. Keep it now to avoid breaking
- * metadata parsed with previous versions.
- */
- $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
- } elseif (!empty($idpentry['name'])) {
+ if (!empty($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
} elseif (!empty($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);
diff --git a/templates/selectidp-links.php b/templates/selectidp-links.php
index 83a99379f..85aa3ca8b 100644
--- a/templates/selectidp-links.php
+++ b/templates/selectidp-links.php
@@ -10,13 +10,7 @@ $this->data['autofocus'] = 'preferredidp';
$this->includeAtTemplateBase('includes/header.php');
foreach ($this->data['idplist'] AS $idpentry) {
- if (isset($idpentry['UIInfo']['DisplayName'])) {
- /* TODO: remove this branch, If ['UIInfo']['DisplayName'] is available, it will get through to 'name' in the
- * metadata parsed with SSP >= 1.13.0, so this code is no longer necessary. Keep it now to avoid breaking
- * metadata parsed with previous versions.
- */
- $this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['UIInfo']['DisplayName']);
- } elseif (isset($idpentry['name'])) {
+ if (isset($idpentry['name'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['name']);
} elseif (isset($idpentry['OrganizationDisplayName'])) {
$this->includeInlineTranslation('idpname_' . $idpentry['entityid'], $idpentry['OrganizationDisplayName']);
--
GitLab