From 261b4521c81e8636164b79a774ff98de6b1ed415 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 20 Oct 2010 12:07:10 +0000 Subject: [PATCH] as the pricipal of current user is influenced by GroupDAV prefs, we have to include them in the etag --- phpgwapi/inc/class.groupdav_principals.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php index 94004bb427..92abc89525 100644 --- a/phpgwapi/inc/class.groupdav_principals.inc.php +++ b/phpgwapi/inc/class.groupdav_principals.inc.php @@ -530,6 +530,9 @@ class groupdav_principals extends groupdav_handler { $account = $this->read($account); } - return 'EGw-'.$account['account_id'].':'.md5(serialize($account)).'-wGE'; + return 'EGw-'.$account['account_id'].':'.md5(serialize($account)). + // as the pricipal of current user is influenced by GroupDAV prefs, we have to include them in the etag + ($account['account_id'] == $GLOBALS['egw_info']['user']['account_id'] ? + ':'.md5(serialize($GLOBALS['egw_info']['user']['preferences']['groupdav'])) : '').'-wGE'; } } \ No newline at end of file