From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 14 Oct 2012 15:42:04 +0000 (+0200)
Subject: Unified names for user group cache files
X-Git-Tag: 2.0.0_Beta_1~870^2~23
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e85351ba75b6381a3ad355fd69cf80c936c33f08;p=GitHub%2FWoltLab%2FWCF.git

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 95a72a7231..a5b361d4c4 100644
--- 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 1bb59c455a..90fc4901ce 100644
--- 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 2a91145d72..6c4a62841a 100644
--- 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 d0ffda71b4..82efbfb426 100644
--- 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'
 		);