From: Gabriel Ebner <gabriel@svn.openstreetmap.org>
Date: Thu, 30 Aug 2007 09:29:34 +0000 (+0000)
Subject: Merge commit 'git-svn'
X-Git-Tag: live~8093^2~26
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/37cfb1780932c32666074124ec2f62cfbdcf9aca

Merge commit 'git-svn'
---

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8bfe2a612..de81f188b 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -81,7 +81,7 @@ class NodeController < ApplicationController
       if node.visible
         if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ])
           render :nothing => true, :status => :precondition_failed
-        else if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
+        elsif RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]])
           render :nothing => true, :status => :precondition_failed
         else
           node.user_id = @user.id