Merge pull request #110 from plone/fix_delete_reference

Prevent AttributeError on deleting a Reference
plone · Aug 5, 2018 · 7068c71 · 7068c71
2 parents fc150a7 + 7bc06f0
commit 7068c71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,8 +14,9 @@ New features:
 
 Bug fixes:
 
-- *add item here*
-
+- Prevent AttributeError on deleting a Reference from a object that is
+  gone. Backport from master #91. Fixes plone/plone.app.contenttypes#41.
+  [fredvd, pbauer]
 
 1.9.18 (2018-05-03)
 -------------------

diff --git a/Products/Archetypes/ReferenceEngine.py b/Products/Archetypes/ReferenceEngine.py
@@ -557,6 +557,8 @@ def _getUUIDFor(self, object):
     def _deleteReference(self, referenceObject):
         try:
             sobj = referenceObject.getSourceObject()
+            if sobj is None:
+                return
             referenceObject.delHook(self, sobj,
                                     referenceObject.getTargetObject())
         except ReferenceException: