From 28f816f0ac6b9f02a1cee37545ba042f651af342 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Mon, 6 Oct 2014 14:54:26 +0200
Subject: [PATCH] Make sure no empty name ends up in remote metadata for IdPs
 or SPs.

---
 lib/SimpleSAML/Metadata/SAMLParser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 71b4b8acf..be930bd35 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -636,7 +636,7 @@ class SimpleSAML_Metadata_SAMLParser {
 		$this->addExtensions($ret, $spd);
 
 		// prioritize mdui:DisplayName as the name if available
-		if (isset($ret['UIInfo']) && isset($ret['UIInfo']['DisplayName'])) {
+		if (!empty($ret['UIInfo']['DisplayName'])) {
 			$ret['name'] = $ret['UIInfo']['DisplayName'];
 		}
 
@@ -705,7 +705,7 @@ class SimpleSAML_Metadata_SAMLParser {
 		$this->addExtensions($ret, $idp);
 
 		// prioritize mdui:DisplayName as the name if available
-		if (isset($ret['UIInfo']) && isset($ret['UIInfo']['DisplayName'])) {
+		if (!empty($ret['UIInfo']['DisplayName'])) {
 			$ret['name'] = $ret['UIInfo']['DisplayName'];
 		}
 
-- 
GitLab