app/controllers/alchemy/base_controller.rb in alchemy_cms-2.2.rc11 vs app/controllers/alchemy/base_controller.rb in alchemy_cms-2.2.rc13

- old
+ new

@@ -7,11 +7,11 @@ protect_from_forgery before_filter :set_language before_filter :mailer_set_url_options - helper_method :current_server, :current_user, :t + helper_method :current_server, :t # Returns a host string with the domain the app is running on. def current_server # For local development server if request.port != 80 @@ -26,23 +26,9 @@ return Alchemy::Config.get(name) end def multi_language? Language.published.count > 1 - end - - def current_user - return @current_user if defined?(@current_user) - @current_user = current_user_session && current_user_session.record - end - - def current_user_session - return @current_user_session if defined?(@current_user_session) - @current_user_session = UserSession.find - end - - def logged_in? - !current_user.blank? end def raise_not_found_error raise ActionController::RoutingError.new('Not Found') end