Merge commit 'core/fix-upload-archive' into development

cykod · Jul 29, 2010 · a647e60 · a647e60
2 parents fb83654 + e02dc88
commit a647e60
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/models/domain_file.rb b/app/models/domain_file.rb
@@ -156,10 +156,9 @@ def replace_same
         match.replace(self)
         return match
       end
-      return self
     end
-    return false
-
+
+     self
    end
 
    # Copy copy this file to a new file