Merge pull request ezsystems#1094 from joaoinacio/EZP-23499_no_dataty…

…pe_remove Fix EZP-23499: Fatal error removing class with unexistant datatype.
ezpublishlegacy · Oct 30, 2014 · 26bee38 · 26bee38
2 parents e05dc3e + cc73a1c
commit 26bee38
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/kernel/classes/ezcontentclass.php b/kernel/classes/ezcontentclass.php
@@ -812,7 +812,17 @@ function removableInformation( $includeAll = true )
         foreach ( $this->fetchAttributes() as $attribute )
         {
             $dataType = $attribute->dataType();
-            if ( !$dataType->isClassAttributeRemovable( $attribute ) )
+
+            if ( $dataType === null )
+            {
+                eZDebug::writeError(
+                    "Skipping removal of class attribute for non-existent datatype " . $attribute->DataTypeString,
+                    __METHOD__
+                );
+                continue;
+            }
+
+            if ( $dataType->isClassAttributeRemovable( $attribute ) )
             {
                 $info = $dataType->classAttributeRemovableInformation( $attribute, $includeAll );
                 $result['list'][] = $info;
@@ -857,6 +867,14 @@ function removeAttributes( $removeAttributes = false, $version = false )
             foreach ( $classAttributes as $classAttribute )
             {
                 $dataType = $classAttribute->dataType();
+                if ( $dataType === null )
+                {
+                    eZDebug::writeError(
+                        "Skipping removal of class attribute for non-existent datatype " . $classAttribute->DataTypeString,
+                        __METHOD__
+                    );
+                    continue;
+                }
                 $dataType->deleteStoredClassAttribute( $classAttribute, $version );
             }
             eZPersistentObject::removeObject( eZContentClassAttribute::definition(),