From 28913f42898f929c12a4c13206eb9f6d1cda10a7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Fri, 9 Nov 2012 16:34:41 +0100 Subject: [PATCH] Change isSingletonInitialized to isInitialized --- wcfsetup/install/files/lib/system/SingletonFactory.class.php | 2 +- wcfsetup/install/files/lib/system/WCF.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wcfsetup/install/files/lib/system/SingletonFactory.class.php b/wcfsetup/install/files/lib/system/SingletonFactory.class.php index 27a26f92ee..b2ec732f33 100644 --- a/wcfsetup/install/files/lib/system/SingletonFactory.class.php +++ b/wcfsetup/install/files/lib/system/SingletonFactory.class.php @@ -64,7 +64,7 @@ abstract class SingletonFactory { * * @return boolean */ - public static final function isSingletonInitialized() { + public static final function isInitialized() { $className = get_called_class(); return isset(self::$__singletonObjects[$className]); diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 775492cd1e..c33db794ac 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -143,7 +143,7 @@ class WCF { } // close cache source - if (CacheHandler::isSingletonInitialized() && is_object(CacheHandler::getInstance()) && is_object(CacheHandler::getInstance()->getCacheSource())) { + if (CacheHandler::isInitialized() && is_object(CacheHandler::getInstance()) && is_object(CacheHandler::getInstance()->getCacheSource())) { CacheHandler::getInstance()->getCacheSource()->close(); } -- 2.20.1