MetadataStorageHandler: The metadata should always contain the entity id.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1600 44740490-163a-0410-bde0-09ae8108e29a

lib/SimpleSAML/Metadata/MetaDataStorageHandler.php

@@ -308,6 +308,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandler {
 				
 				$metadata['metadata-index'] = $index;
 				$metadata['metadata-set'] = $set;
+				assert('array_key_exists("entityid", $metadata)');
 				return $metadata;
 			}
 		}