diff options
| author | Andreas Åkre Solberg <andreas.solberg@uninett.no> | 2009-01-27 14:23:09 +0000 |
|---|---|---|
| committer | Andreas Åkre Solberg <andreas.solberg@uninett.no> | 2009-01-27 14:23:09 +0000 |
| commit | fcaf54e5bb09d4b13a0be99c6b532d46ac537999 (patch) | |
| tree | 19961940a58deb008664e8637465931bc7783e1e /lib/SimpleSAML/Metadata/SAMLParser.php | |
| parent | 1694905be213d49d161ff42a571fa35dbc69b716 (diff) | |
| download | simplesamlphp-fcaf54e5bb09d4b13a0be99c6b532d46ac537999.zip simplesamlphp-fcaf54e5bb09d4b13a0be99c6b532d46ac537999.tar.gz simplesamlphp-fcaf54e5bb09d4b13a0be99c6b532d46ac537999.tar.bz2 | |
Handling multiple name and description languages in metadata
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1207 44740490-163a-0410-bde0-09ae8108e29a
Diffstat (limited to 'lib/SimpleSAML/Metadata/SAMLParser.php')
| -rw-r--r-- | lib/SimpleSAML/Metadata/SAMLParser.php | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php index 24a15d1..216b757 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)) { |