0
@@ -85,7 +85,7 @@ class Asset < ActiveRecord::Base
0
 
0
   protected
0
     def rename_unique_filename
0
-      if (@old_filename || new_record?) && errors.empty? && site_id && filename
0
+      if ((@old_filename && !@old_filename.eql?(full_filename)) || new_record?) && errors.empty? && site_id && filename
0
         i      = 1
0
         pieces = filename.split('.')
0
         ext    = pieces.size == 1 ? nil : pieces.pop

0
@@ -44,6 +44,13 @@ class AssetTest < Test::Unit::TestCase
0
     assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, "logo_1.png")
0
   end
0
 
0
+  def test_should_not_rename_file_on_update
0
+    asset = process_upload
0
+    old_filename = asset.filename
0
+    asset.update_attributes({ :filename => 'logo.png' })
0
+    assert_equal old_filename, asset.filename
0
+  end
0
+
0
   def test_should_upload_file_in_multi_sites_mode
0
     Site.multi_sites_enabled = true
0
     process_upload