Merge branch 'master' of github.com:r888888888/danbooru

2012-09-19 16:53:49 -04:00
parent 858a8ed72a c70a5c8fed
commit 3a11b0e6ed
1 changed files with 3 additions and 3 deletions
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -48,8 +48,8 @@ class Upload < ActiveRecord::Base
  end
  
  module ConversionMethods
-    def process!
-      return if status =~ /processing|completed|error/
+    def process! force=false
+      return if !force && status =~ /processing|completed|error/
      
      CurrentUser.scoped(uploader, uploader_ip_addr) do
        update_attribute(:status, "processing")