Fix a bug where quickvote displays name cant be blank twice. validators are inherited...

[selectricity-live] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
old mode 100755 (executable)
new mode 100644 (file)
index 7462619..9b48030
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,9 +1,9 @@
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.
 # Filters added to this controller will be run for all controllers in the application.
 # Likewise, all the methods added will be available for all controllers.

-require 'login_engine'

 
 class ApplicationController < ActionController::Base
 
 class ApplicationController < ActionController::Base

-  include LoginEngine
+  include AuthenticatedSystem

   helper :user
   helper :user

-  model :user
+  require_dependency "user"
+  

 end
 end