Moves object type cache handling to ObjectTypeCache

diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
index c348ee3c4868eb54afedf8b269a9847f622f5071..d9ae5f991de9fef35cd7a5dfd95c82118d6f0eea 100644 (file)
--- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeCache.class.php
@@ -131,4 +131,12 @@ class ObjectTypeCache extends SingletonFactory {
                
                return null;
        }
+       
+       /**
+        * Resets and reloads the object type cache.
+        */
+       public function resetCache() {
+               CacheHandler::getInstance()->clearResource('objectType-'.PACKAGE_ID);
+               $this->init();
+       }
 }

diff --git a/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php b/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php
index 22e2c6579d60b4a5984ee0806c0f08494e3ba347..1693817a511a48f4a00df450d0ee9d51aee50a1d 100644 (file)
--- a/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php
+++ b/wcfsetup/install/files/lib/data/object/type/ObjectTypeEditor.class.php
@@ -24,7 +24,6 @@ class ObjectTypeEditor extends DatabaseObjectEditor implements IEditableCachedOb
         * @see wcf\data\IEditableCachedObject::resetCache()
         */
        public static function resetCache() {
-               // clear cache
-               CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.objectType*.php');
+               ObjectTypeCache::getInstance()->resetCache();
        }
 }