Merged V3.2E to HEAD

17623: ETHREEOH-1733 - fix for multiday events that x weeks long exactly
   17625: Fix for ETHREEOH-3468
          - Missing null check in WebScript AbstractRuntime when an authenticator is not provided by the Runtime.
   17626: missed checkin file for ETHREEOH-1733 fix
   17627: Undid change fix for ETHREEOH-1229: Can't delete space that contains "translation without content"
          - I can't see how this affects the build but one has to start somewhere
   17628: Added a getParentAssocs in test to help diagnose failure cause
   17629: ETHREEOH-3062 - Minimize Share treeview load during expansion
   17630: Fix unreported issue where argsM values are incorrect when more than one parameter present on the URL in SURF local WebScript request.
          Also minor performance improvements to SURF/WSF after profiling tests.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java

@@ -128,8 +128,15 @@ public class MultilingualDocumentAspect implements
      */
     public void beforeDeleteNode(NodeRef nodeRef)
     {
-        // First unhook it
-        multilingualContentService.unmakeTranslation(nodeRef);
+        if (nodeService.hasAspect(nodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
+        {
+            // We just let it get deleted
+        }
+        else
+        {
+            // First unhook it
+            multilingualContentService.unmakeTranslation(nodeRef);
+        }
     }
 
     /**