From 7bd41733886ca5366e2cf5a05d02b5e5e15e8bbd Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 27 Jun 2018 15:39:19 -0400
Subject: [PATCH] Revert "Debugging output for subscription issue"

This reverts commit a0582c7e1e5b16b1b3d290711b4f8a146ec98d74.
---
 SoObjects/SOGo/SOGoGCSFolder.m    | 18 ++----------------
 SoObjects/SOGo/SOGoParentFolder.m |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 4770c864f..bd60c49b2 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -282,11 +282,6 @@ static NSArray *childRecordFields = nil;
       else
         name = primaryDN;
     }
-  else
-    {
-      [self errorWithFormat: @"(%s): No c_foldername defined (%@)",
-            __PRETTY_FUNCTION__, [container defaultFolderName]];
-    }
 
   return name;
 }
@@ -347,12 +342,7 @@ static NSArray *childRecordFields = nil;
           [fc cancelFetch];
           [cm releaseChannel: fc];
         }
-      NS_HANDLER
-        {
-          [self errorWithFormat: @"(%s): Could not fetch c_foldername from %@ for c_path %@",
-                __PRETTY_FUNCTION__, [folderLocation gcsTableName], ocsPath];
-          [self errorWithFormat: @"%@", localException];
-        }
+      NS_HANDLER;
       NS_ENDHANDLER;
     }
 
@@ -449,11 +439,7 @@ static NSArray *childRecordFields = nil;
       record = [[self folderManager] recordAtPath: _path];
 
       if (!record)
-        {
-          [self errorWithFormat: @"(%s): Can't find record at path %@",
-                __PRETTY_FUNCTION__, _path];
-          return nil;
-        }
+	return nil;
 
       [cache setValue: [record jsonRepresentation]  forKey: _path];
     }
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index ae523f935..fe6ef6077 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -289,7 +289,7 @@ static SoSecurityManager *sm = nil;
 
   // We check with -ocsFolderForPath if the folder also exists in the database.
   // This is important because user A could delete folder X, and user B has subscribed to it.
-  // If the "default roles" are enabled for calendars/address books, -validatePermission:.. will
+  // If the "default roles" are enabled for calendars/address books, -validatePersmission:.. will
   // work (grabbing the default role) and the deleted resource will be incorrectly returned.
   if (subscribedFolder
       && [subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]]