Merge branch '2017.12' into 2018.09

Author: glye

kernel/classes/datatypes/ezimage/ezimagetype.php

@@ -190,6 +190,7 @@ function deleteStoredObjectAttribute( $contentObjectAttribute, $version = null )
             $imageHandler->setAttribute( 'alternative_text', false );
             $imageHandler->removeAliases();
             $imageHandler->store( $contentObjectAttribute );
+            $contentObjectAttribute->setContent( null );
         }
     }
 

kernel/content/attribute_edit.php

@@ -334,10 +334,6 @@
     $db->begin();
     $object->setName( $class->contentObjectName( $object, $version->attribute( 'version' ), $EditLanguage ), $version->attribute( 'version' ), $EditLanguage );
     $db->commit();
-
-    // While being fetched, attributes might have been modified.
-    // The list needs to be refreshed so it is accurately displayed.
-    $contentObjectAttributes = $version->contentObjectAttributes( $EditLanguage );
 }
 elseif ( $storingAllowed )
 {