From b16980be51ce8406926f18c60151748a52ca0b6d Mon Sep 17 00:00:00 2001 From: Toks Date: Mon, 28 Apr 2014 14:33:13 -0400 Subject: [PATCH] fixes #2138 --- app/controllers/uploads_controller.rb | 2 +- app/models/upload.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 35eeee7f3..94a94a7ff 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -38,7 +38,7 @@ class UploadsController < ApplicationController end def create - @upload = Upload.create(params[:upload].merge(:server => Socket.gethostname)) + @upload = Upload.create(params[:upload].merge(:server => Socket.gethostname)) @upload.process! if @upload.errors.empty? respond_with(@upload) end diff --git a/app/models/upload.rb b/app/models/upload.rb index ff5208e50..1a3246d43 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -13,7 +13,7 @@ class Upload < ActiveRecord::Base after_destroy :delete_temp_file validate :uploader_is_not_limited, :on => :create validate :file_or_source_is_present, :on => :create - attr_accessible :file, :image_width, :image_height, :file_ext, :md5, :file_size, :as_pending, :source, :file_path, :content_type, :rating, :tag_string, :status, :backtrace, :post_id, :md5_confirmation + attr_accessible :file, :image_width, :image_height, :file_ext, :md5, :file_size, :as_pending, :source, :file_path, :content_type, :rating, :tag_string, :status, :backtrace, :post_id, :md5_confirmation, :parent_id module ValidationMethods def uploader_is_not_limited