Unified names for user group cache files

Fixes #749

diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
index 95a72a72310ec5bdd59e662bb1dab42ed9ce421b..a5b361d4c41843a00cd2d8ab71f8a9c2fd09da8b 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
@@ -198,7 +198,7 @@ class UserGroup extends DatabaseObject {
                if (self::$cache === null) {
                        CacheHandler::getInstance()->addResource(
                                'usergroups',
-                               WCF_DIR.'cache/cache.usergroups.php',
+                               WCF_DIR.'cache/cache.userGroups.php',
                                'wcf\system\cache\builder\UserGroupCacheBuilder'
                        );
                        self::$cache = CacheHandler::getInstance()->get('usergroups');

diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
index 1bb59c455a4585e648f9b8db9b25da270fda8e84..90fc4901cea670301437deaac6bbbeb94f8c8d6d 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroupEditor.class.php
@@ -200,7 +200,7 @@ class UserGroupEditor extends DatabaseObjectEditor implements IEditableCachedObj
         */
        public static function resetCache() {
                // clear cache
-               CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.groups*.php');
+               CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.userGroups*.php');
                
                // clear sessions
                SessionHandler::resetSessions();

diff --git a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php
index 2a91145d72a89b33217e5910301cfdbd89ab1f5e..6c4a62841a14b244cc521012b644df990fd04d8f 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/option/UserGroupOptionAction.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\data\user\group\option;
+use wcf\data\user\group\UserGroupEditor;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;
@@ -52,6 +53,6 @@ class UserGroupOptionAction extends AbstractDatabaseObjectAction {
                }
                
                // clear cache
-               CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.groups-*.php');
+               UserGroupEditor::resetCache();
        }
 }

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index d0ffda71b45c5d48cdfdaff185b856648f7e75af..82efbfb4264e860bb2fc460450b007437b48f5e4 100644 (file)
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -406,7 +406,7 @@ class SessionHandler extends SingletonFactory {
                $cacheName = 'groups-'.PACKAGE_ID.'-'.$groups;
                CacheHandler::getInstance()->addResource(
                        $cacheName,
-                       WCF_DIR.'cache/cache.groups-'.PACKAGE_ID.'-'.$groupsFileName.'.php',
+                       WCF_DIR.'cache/cache.userGroups-'.PACKAGE_ID.'-'.$groupsFileName.'.php',
                        'wcf\system\cache\builder\UserGroupPermissionCacheBuilder'
                );