X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=6330331d46b1b8fb983cc7eb8ccd4f7d83175be2;hp=ca01a2a2a75abcbb479361fea5b5593e5d47c9a2;hb=4b88c118b615335d06bd74e444173d21aef4406c;hpb=fffe0ef5a4c39831127b1afed64d8ea0e077b09e

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index ca01a2a2..6330331d 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -73,6 +73,15 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		$this->instanceRegistry[$instanceKey] = $objectInstance;
 	}
 
+	/**
+	 * Getter for whole instanceregistry
+	 *
+	 * @return	$instanceRegistry	The whole instance registry array
+	 */
+	public final function getInstanceRegistry () {
+		return $this->instanceRegistry;
+	}
+
 	/**
 	 * Adds a new entry to the given list name. If you want to add objects
 	 * please use addInstance() and getInstance() instead.
@@ -117,12 +126,21 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 
 		// "Walk" over all entries
 		foreach ($this->getEntries('object-name') as $key=>$value) {
+			// Debug message
+			//* DEBUG: */ $this->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+
 			// If $value matches the $lookFor, we need to look for more entries for this!
 			if ($lookFor == $value) {
 				// Look for more entries
 				foreach ($this->getEntries() as $key2=>$value2) {
+					// Debug message
+					//* DEBUG: */ $this->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
+
 					// Both keys must match!
-					if ($key == $key2) {
+					if (($key == $key2) || (isset($value2[$key]))) {
+						// Debug message
+						//* DEBUG: */ $this->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+
 						// Then add it
 						$entry[$key2] = $value2[$key];
 					} // END - if