t#29806:fix;picture revision can be up

diff --git a/app/models/picture.rb b/app/models/picture.rb
index a4b9e38..4669b4b 100644 (file)
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@ -21,11 +21,12 @@ class Picture < ActiveRecord::Base
   end
   
   def overwrite rp
-    attr = {:revision => self.new_revision,:width => rp.width, :height => rp.height, :ext => rp.ext, :filesize => rp.filesize, 
+    attr = {:width => rp.width, :height => rp.height, :ext => rp.ext, :filesize => rp.filesize, 
       :original_picture_id => rp.original_picture_id, :license_id => rp.license_id, :artist_id => rp.artist_id, 
       :md5 => rp.md5, :artist_name => rp.artist_name, :classname => rp.classname, :credit => rp.credit, :settings => rp.settings
     }
     self.attributes = attr
+    self.revision = self.new_revision   #Do not move to attr. new_revision reffernces self.original_picture_id
   end
   
   def own? author