From 7fad98052028505d3b40f3d51cf0ff1e40b24b94 Mon Sep 17 00:00:00 2001
From: Martin Gruner <martin.gruner@otrs.com>
Date: Fri, 19 Oct 2018 09:27:45 +0200
Subject: [PATCH] Follow-up fix for bug#13978 - User and customer preferences
 may override user data.

---
 CHANGES.md                                      | 1 +
 Kernel/System/CustomerUser.pm                   | 1 +
 Kernel/System/User.pm                           | 1 +
 scripts/test/CustomerUser/PreferencesOverride.t | 2 +-
 scripts/test/User/PreferencesOverride.t         | 3 ++-
 5 files changed, 6 insertions(+), 2 deletions(-)

--- a/Kernel/System/CustomerUser.pm
+++ b/Kernel/System/CustomerUser.pm
@@ -592,6 +592,7 @@ sub SetPreferences {
     );
 
     return 0 if $Blacklisted{ $Param{Key} };
+    return 0 if substr( $Param{Key}, 0, 11 ) eq 'UserIsGroup';
 
     # check if user exists
     my %User = $Self->CustomerUserDataGet( User => $Param{UserID} );
--- a/Kernel/System/User.pm
+++ b/Kernel/System/User.pm
@@ -1202,6 +1202,7 @@ sub SetPreferences {
     );
 
     return 0 if $Blacklisted{ $Param{Key} };
+    return 0 if substr( $Param{Key}, 0, 11 ) eq 'UserIsGroup';
 
     # get current setting
     my %User = $Self->GetUserData(