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 27a26f92ee0c4754ea5fc10c8d887e676093f2ad..b2ec732f33c2056e6ab2a80f1e078d643a78fa73 100644 (file)
--- 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 775492cd1ea4afcd3148b33a6f92d98e59c01cbd..c33db794ac20f74b7dc1a6d1f45e2d6ec65ead63 100644 (file)
--- 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();
                }