From 9828f9e51ff3d93cd85fa5a4163152496e658f81 Mon Sep 17 00:00:00 2001
From: c3 <courtenay@entp.com>
Date: Thu, 6 Aug 2009 13:41:12 -0700
Subject: [PATCH] Fix some warnings, bad merged code

---
 app/controllers/sessions_controller.rb | 4 ++--
 app/views/posts/edit.html.erb          | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2102dcadb..a52ed54c7 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -32,7 +32,7 @@ def password_authentication(name, password)
     if @current_user = current_site.users.authenticate(name, password)
       successful_login
     else
-      failed_login I18n.t 'txt.invalid_login', :default => "Invalid login"
+      failed_login I18n.t('txt.invalid_login', :default => "Invalid login")
    end
   end
 
@@ -52,7 +52,7 @@ def open_id_authentication(openid_url)
         end
         successful_login
       else
-        failed_login I18n.t 'txt.invalid_openid', :default => "Sorry, no user by the identity URL #{openid_url} exists"
+        failed_login I18n.t('txt.invalid_openid', :default => "Sorry, no user by the identity URL #{openid_url} exists")
       end
     else
       failed_login result.message
diff --git a/app/views/posts/edit.html.erb b/app/views/posts/edit.html.erb
index a7d5c17a8..f2d1d5059 100644
--- a/app/views/posts/edit.html.erb
+++ b/app/views/posts/edit.html.erb
@@ -9,5 +9,7 @@
 <% form_for :post, :html => { :method => :put }, 
      :url  => forum_topic_post_path(@post.forum, @post.topic, @post, :page => current_page) do |f| -%>
 <p id="post_body"><%= f.text_area :body %></p>
-<%= submit_tag I18n.t('txt.views_posts.save', :default => 'Save post') %> <%= I18n.t 'txt.or', :default => 'or' %> <%= link_to link_to(I18n.t('txt.cancel', :default => 'cancel'), forum_topic_path(@post.forum, @post.topic, :page => current_page) %>
+<p><%= submit_tag I18n.t('txt.views_posts.save', :default => 'Save post') %> 
+  <%= I18n.t 'txt.or', :default => 'or' %> 
+  <%= link_to I18n.t('txt.cancel', :default => 'cancel'), forum_topic_path(@post.forum, @post.topic, :page => current_page) %></p>
 <% end -%>
\ No newline at end of file