From f9c4804bf6712401cd24490fa4e52823d83ca68b Mon Sep 17 00:00:00 2001
From: Claudius Nicolae <clyfe@n50.(none)>
Date: Tue, 5 Mar 2013 18:11:29 +0200
Subject: [PATCH] oops

---
 app/controllers/application_controller.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 53fb345..a55bd9c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,11 +14,7 @@ class ApplicationController < ActionController::Base
   
   def set_timezone
     old_time_zone = Time.zone
-    if user_signed_in? && current_user.timezone.present?
-      Time.zone = current_user.timezone
-    elsif cookies[:time_zone].present?
-      Time.zone = cookies[:time_zone]
-    end
+    Time.zone = cookies[:time_zone] if cookies[:time_zone].present?
     yield
   ensure
     Time.zone = old_time_zone