X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=718f0a4f24b17176e13676eaf7562f0c44d8122e;hp=7106d5c72e83b63efacd25376c395aca26b254f3;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hpb=18fd6edc11a36a3e52870f1946499e448a863ea7

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index 7106d5c7..718f0a4f 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
  *
@@ -25,7 +25,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	/**
 	 * Instance of this class
 	 */
-	private static $registryInstance = null;
+	private static $registryInstance = NULL;
 
 	/**
 	 * Instance registry
@@ -74,7 +74,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	}
 
 	/**
-	 * Getter for whole instanceregistry
+	 * Getter for whole instance registry
 	 *
 	 * @return	$instanceRegistry	The whole instance registry array
 	 */
@@ -100,7 +100,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 *
 	 * @return	$entries	An array with entries from this registry
 	 */
-	public final function getEntries ($key = null) {
+	public final function getEntries ($key = NULL) {
 		// Default is whole array
 		$entries = $this->rawEntries;
 
@@ -126,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
@@ -155,7 +164,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 */
 	public function getInstance ($instanceKey) {
 		// By default the instance is not in registry
-		$objectInstance = null;
+		$objectInstance = NULL;
 
 		// Is the instance there?
 		if ($this->instanceExists($instanceKey)) {