From 6d9c5e4542204dfb6c980ad777596f11e38e24f1 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Thu, 20 Oct 2016 10:27:26 -0400
Subject: [PATCH] (fix) make sure we unencode @ signs before storing them in
 the ACL table

---
 SoObjects/SOGo/SOGoGCSFolder.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 9afed6a5d..a4036ec50 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1831,6 +1831,10 @@ static NSArray *childRecordFields = nil;
   SOGoGroup *group;
 
   objectPath = [objectPathArray componentsJoinedByString: @"/"];
+
+  // We make sure we don't get unescaped uid - like foo%40bar.com
+  // or for groups - like %40team
+  uid = [uid stringByUnescapingURL];
   aUID = uid;
   if (![uid hasPrefix: @"@"])
     {