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

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;
 		}