diff options
author | Olav Morken <olav.morken@uninett.no> | 2010-05-27 05:55:25 +0000 |
---|---|---|
committer | Olav Morken <olav.morken@uninett.no> | 2010-05-27 05:55:25 +0000 |
commit | 76779f3eb77a3433095e61fd746291b9cbef1469 (patch) | |
tree | 16f3606155389ba3c358b3e9c1d84fecfb136c5f /lib/SimpleSAML/Metadata/SAMLParser.php | |
parent | b06088caff2107cd1d594af53b23c45b2b463b56 (diff) | |
download | simplesamlphp-76779f3eb77a3433095e61fd746291b9cbef1469.zip simplesamlphp-76779f3eb77a3433095e61fd746291b9cbef1469.tar.gz simplesamlphp-76779f3eb77a3433095e61fd746291b9cbef1469.tar.bz2 |
SAMLParser: Fix extraction of name and description for discovery service.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2323 44740490-163a-0410-bde0-09ae8108e29a
Diffstat (limited to 'lib/SimpleSAML/Metadata/SAMLParser.php')
-rw-r--r-- | lib/SimpleSAML/Metadata/SAMLParser.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/SimpleSAML/Metadata/SAMLParser.php b/lib/SimpleSAML/Metadata/SAMLParser.php index 7820bb1..40c950a 100644 --- a/lib/SimpleSAML/Metadata/SAMLParser.php +++ b/lib/SimpleSAML/Metadata/SAMLParser.php @@ -376,12 +376,16 @@ class SimpleSAML_Metadata_SAMLParser { * Add organizational metadata */ if (!empty($this->organizationName)) { + $ret['name'] = $this->organizationName; + $ret['description'] = $this->organizationName; $ret['OrganizationName'] = $this->organizationName; } if (!empty($this->organizationDisplayName)) { + $ret['name'] = $this->organizationDisplayName; $ret['OrganizationDisplayName'] = $this->organizationDisplayName; } if (!empty($this->organizationURL)) { + $ret['url'] = $this->organizationURL; $ret['OrganizationURL'] = $this->organizationURL; } |