X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fregistry%2Fclass_BaseRegistry.php;h=c9a80904baad799108992aeef521eaabe8279feb;hb=f5cf5211620c1813c76d8231819b63a585fb2689;hp=e16ded285d03062011f626211db1ef56eb5b1cac;hpb=aae25237f01ddf26dda0b93779a0d3c231b5b789;p=core.git

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index e16ded28..c9a80904 100644
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -96,8 +96,14 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 	 * @return	void
 	 */
 	public final function addEntry ($key, $value) {
+		// Is the array there?
+		if (!isset($this->rawEntries[$key])) {
+			// Then intialize it here
+			$this->rawEntries[$key] = array();
+		} // END - if
+
 		// Simply add it
-		$this->rawEntries[$key][] = $value;
+		array_push($this->rawEntries[$key], $value);
 	}
 
 	/**
@@ -110,7 +116,7 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		$entries = $this->rawEntries;
 
 		// Is $key set?
-		if (!is_null($key)) {
+		if ((!is_null($key)) && (isset($this->rawEntries[$key]))) {
 			// Then use this entry
 			$entries = $this->rawEntries[$key];
 		} // END - if
@@ -133,19 +139,19 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
 		// "Walk" over all entries
 		foreach ($this->getEntries($arrayKey) as $key => $value) {
 			// Debug message
-			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key=' . $key . ',value=' . $value . ',lookFor=' . $lookFor);
+			//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: 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: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
+					//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Checking key2=' . $key2 . ',value2=' . print_r($value2, true) . ',lookFor=' . $lookFor);
 
 					// Both keys must match!
 					if (($key == $key2) || (isset($value2[$key]))) {
 						// Debug message
-						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+						//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
 
 						// Then add it
 						$entry[$key2] = $value2[$key];