From d80aa06027f7eafcabc7c5e307d2126456a6dc0a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Feb 2023 10:45:25 +0100 Subject: [PATCH] Continued: - fixed E_NOTICE --- .../main/classes/registry/generic/class_GenericRegistry.php | 4 ++-- .../main/classes/registry/object/class_ObjectRegistry.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/main/classes/registry/generic/class_GenericRegistry.php b/framework/main/classes/registry/generic/class_GenericRegistry.php index 5c2b3a01..a95f38ce 100644 --- a/framework/main/classes/registry/generic/class_GenericRegistry.php +++ b/framework/main/classes/registry/generic/class_GenericRegistry.php @@ -58,8 +58,8 @@ class GenericRegistry extends BaseRegistry implements Register { } // Is an instance there? - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s][]=%s', $key, gettype(self::$registryInstances[$key]))); - if (is_null(self::$registryInstances[$key])) { + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s]?=%d', $key, intval(isset((self::$registryInstances[$key]))))); + if (!isset(self::$registryInstances[$key])) { // Not yet, so create one self::$registryInstances[$key] = new ObjectRegistry(); } diff --git a/framework/main/classes/registry/object/class_ObjectRegistry.php b/framework/main/classes/registry/object/class_ObjectRegistry.php index b3c810c9..13b55b8d 100644 --- a/framework/main/classes/registry/object/class_ObjectRegistry.php +++ b/framework/main/classes/registry/object/class_ObjectRegistry.php @@ -74,8 +74,8 @@ class ObjectRegistry extends BaseRegistry implements ObjectRegister { } // Is an instance there? - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s][]=%s', $key, gettype(self::$registryInstances[$key]))); - if (is_null(self::$registryInstances[$key])) { + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('OBJECT-REGISTRY: self::registryInstance[%s]?=%d', $key, intval(isset(self::$registryInstances[$key])))); + if (!isset(self::$registryInstances[$key])) { // Not yet, so create one self::$registryInstances[$key] = new ObjectRegistry(); } -- 2.39.2