Merge branch 'production'

* production:
  MBS-11468: ISE on "Edit cover art" edits
  MBS-11470: Ensure to_json_object(type) does run in Area::Edit

Author: reosarevok

lib/MusicBrainz/Server/Edit/Area/Edit.pm

@@ -116,7 +116,7 @@ sub build_display_data
         $data->{ended}{new} = boolean_to_json($data->{ended}{new});
     }
 
-    if (exists $self->data->{new}{type}) {
+    if (exists $self->data->{new}{type_id}) {
         $data->{type}{old} = to_json_object($data->{type}{old});
         $data->{type}{new} = to_json_object($data->{type}{new});
     }

lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm

@@ -131,14 +131,16 @@ sub build_display_data {
 
     my %data;
 
-    $data{release} = to_json_object(
+    my $release = (
         $loaded->{Release}{ $self->data->{entity}{id} } ||
         Release->new( name => $self->data->{entity}{name} )
     );
 
+    $data{release} = to_json_object($release);
+
     $data{artwork} = to_json_object(
         $loaded->{Artwork}{ $self->data->{id} } ||
-        Artwork->new(release => $data{release},
+        Artwork->new(release => $release,
                      id => $self->data->{id},
                      comment => $self->data->{new}{comment} // '',
                      cover_art_types => [ map {
@@ -147,7 +149,6 @@ sub build_display_data {
         )
     );
 
-
     if ($self->data->{old}{types})
     {
         $data{types} = {