Made lower to upper case:

[core.git] / inc / classes / main / registry / class_BaseRegistry.php

diff --git a/inc/classes/main/registry/class_BaseRegistry.php b/inc/classes/main/registry/class_BaseRegistry.php
index a368855c8d0a4a6fa5fae45f9d0fe5d8d1982250..c9a80904baad799108992aeef521eaabe8279feb 100644 (file)
--- 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
@@ -122,29 +128,30 @@ class BaseRegistry extends BaseFrameworkSystem implements Registerable {
        /**
         * "Getter" for an array of all entries for given key
         *
+        * @param       $arrayKey       The array (key) to look in
         * @param       $lookFor        The key to look for
         * @return      $entry          An array with all keys
         */
-       public function getArrayFromKey ($lookFor) {
+       public function getArrayFromKey ($arrayKey, $lookFor) {
                // Init array
                $entry = array();
 
                // "Walk" over all entries
-               foreach ($this->getEntries('object-name') as $key => $value) {
+               foreach ($this->getEntries($arrayKey) as $key => $value) {
                        // Debug message
-                       //* DEBUG: */ $this->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: */ $this->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: */ $this->debugOutput('REGISTRY: Adding ' . $value2[$key] . ' ...');
+                                               //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('REGISTRY[' . __LINE__ . ']: Adding ' . $value2[$key] . ' ...');
 
                                                // Then add it
                                                $entry[$key2] = $value2[$key];