Fix multiple issues with links to /history from the homepage. Thanks to Ed Avis for...

[rails.git] / app / controllers / old_relation_controller.rb

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index f8751d27cf2e965806be2f4db60918645f05bed4..65de83278c7ff4b67181eefa473baedc9ef993b0 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -25,6 +25,11 @@ class OldRelationController < ApplicationController
   def version
     begin
       old_relation = OldRelation.find(:first, :conditions => {:id => params[:id], :version => params[:version]} )
+      if old_relation.nil?
+        # (RecordNotFound is not raised with find :first...)
+        render :nothing => true, :status => :not_found
+        return
+      end
       
       response.headers['Last-Modified'] = old_relation.timestamp.rfc822
 
@@ -32,8 +37,6 @@ class OldRelationController < ApplicationController
       doc.root << old_relation.to_xml_node
 
       render :text => doc.to_s, :content_type => "text/xml"
-    rescue ActiveRecord::RecordNotFound
-      render :nothing => true, :status => :not_found
     rescue
       render :nothing => true, :status => :internal_server_error
     end