Merge commit 'git-svn'

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

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 8bfe2a612fea4cf0d442c2d7a9d4738cf08850ff..de81f188b9bf679768f2a2f690e0d573d4cf2e1d 100644 (file)
--- 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
       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
           render :nothing => true, :status => :precondition_failed
         else
           node.user_id = @user.id