Debug lines added, empty folder removed

[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 7106d5c72e83b63efacd25376c395aca26b254f3..e7f787b17efbdb069dce75748e7d6af2ae65d5d5 100644 (file)
--- a/inc/classes/main/registry/class_BaseRegistry.php
+++ b/inc/classes/main/registry/class_BaseRegistry.php
@@ -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