aggregator: Ensure that entityid and metadata-set are always set.

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

modules/aggregator/lib/Aggregator.php

@@ -96,7 +96,10 @@ class sspmod_aggregator_Aggregator {
 			foreach ($this->sets as $set) {
 				
 				foreach ($source->getMetadataSet($set) as $entityId => $metadata) {
-					
+
+					$metadata['entityid'] = $entityId;
+					$metadata['metadata-set'] = $set;
+
 					if (isset($metadata['tags']) && 
 							count(array_intersect($this->excludeTags, $metadata['tags'])) > 0) {