From: Tim Düsterhus Date: Fri, 9 Nov 2012 15:34:41 +0000 (+0100) Subject: Change isSingletonInitialized to isInitialized X-Git-Tag: 2.0.0_Beta_1~787^2~7^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=28913f42898f929c12a4c13206eb9f6d1cda10a7;p=GitHub%2FWoltLab%2FWCF.git Change isSingletonInitialized to isInitialized --- 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(); }