From fcaf54e5bb09d4b13a0be99c6b532d46ac537999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 27 Jan 2009 14:23:09 +0000
Subject: [PATCH] Handling multiple name and description languages in metadata
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1207 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Metadata/SAMLParser.php | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php
index 24a15d1ba..216b75784 100644
--- a/lib/SimpleSAML/Metadata/SAMLParser.php
+++ b/lib/SimpleSAML/Metadata/SAMLParser.php
@@ -420,19 +420,8 @@ class SimpleSAML_Metadata_SAMLParser {
/*
* Add organizational metadata
*/
- if(array_key_exists('en', $this->organizationName)) {
- $ret['description'] = $this->organizationName['en'];
- } elseif(count($this->organizationName) > 0) {
- $languages = array_keys($this->organizationName);
- $ret['description'] = $this->organizationName[$languages[0]];
- }
-
- if(array_key_exists('en', $this->organizationDisplayName)) {
- $ret['name'] = $this->organizationDisplayName['en'];
- } elseif(count($this->organizationDisplayName) > 0) {
- $languages = array_keys($this->organizationDisplayName);
- $ret['name'] = $this->organizationDisplayName[$languages[0]];
- }
+ $ret['name'] = $this->organizationDisplayName;
+ $ret['description'] = $this->organizationName;
if (!empty($this->tags)) {
--
GitLab