From 449158b94319e1f4c2bce3ffcfd5b2d246c2c8cd Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 3 Aug 2013 21:17:20 +0200
Subject: [PATCH] Upgrade to rails 3.2.14.

---
 Gemfile                                   | 2 +-
 app/controllers/application_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d62a73db4..15a4874d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.13'
+gem 'rails', '3.2.14'
 
 # preparation for rails 4
 #gem 'rails', '4.0.0.rc1'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 609738f6e..a57407fa1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -61,7 +61,7 @@ class ApplicationController < ActionController::Base
   def current_user
     return @_current_user if @_current_user
     return if !session[:user_id]
-    @_current_user = User.find_by_id( session[:user_id] )
+    @_current_user = User.find( session[:user_id] )
   end
   def current_user_set(user)
     @_current_user = user