many things, comments working.

2013-06-24 13:29:39 +02:00
parent 7a894f4f6a
commit fb52e8bed2
44 changed files with 490 additions and 223 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,10 +1,12 @@
 class ApplicationController < ActionController::Base
  protect_from_forgery
-  force_ssl
-  require "Tools"
+  # force_ssl
+  helper :all
+  include ToolsHelper
+  helper_method :current_user
+
  private
  def current_user
-    @current_user ||= User.find(session[:user_id]) if session[:user_id]
+    @current_user ||= User.find_by_id(session[:user_id])
  end
-  helper_method :current_user
-end
+end