From 0f45e8f44b840b0951af52b14f7247991ade32f7 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 10 Aug 2021 17:08:51 +0800 Subject: [PATCH] fix --- app/controllers/application_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7ef5879a2..d3f9c193a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -775,7 +775,8 @@ class ApplicationController < ActionController::Base end def convert_image! - @image = params[:image] || user_params[:image] + @image = params[:image] + @image = @image.nil? && params[:user].present? ? params[:user][:image] : @image return unless @image.present? max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M if @image.class == ActionDispatch::Http::UploadedFile