final fix for #2688: Artists are uneditable

app/views/artists/edit.html.erb

@@ -2,14 +2,15 @@
   <div id="a-edit">
     <h1>Edit Artist</h1>
 
-    <% if !@artist.is_active? %>
+    <% if @artist.editable_by?(CurrentUser.user) %>
+      <%= render "form" %>
+
+    <% elsif !@artist.is_active? %>
       <p>This artist entry is inactive and cannot be edited.</p>
 
     <% elsif @artist.is_banned? %>
       <p>The artist requested removal of this page.</p>
 
-    <% else %>
-      <%= render "form" %>
     <% end %>
   </div>
 </div>