From 857fa24697cb95e8225775795ffbad3bb09dc0cd Mon Sep 17 00:00:00 2001 From: evazion Date: Thu, 28 Dec 2017 18:17:34 -0600 Subject: [PATCH] Fix #3473: Validation warnings for no artist/copyright are still shown on upload failure. --- app/controllers/uploads_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 6c4466f57..082c7f768 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -56,7 +56,10 @@ class UploadsController < ApplicationController if @upload.errors.empty? post = @upload.process! - flash[:notice] = post.warnings.full_messages.join(".\n \n") if post.present? && post.warnings.any? + + if post.present? && post.valid? && post.warnings.any? + flash[:notice] = post.warnings.full_messages.join(".\n \n") + end end save_recent_tags