turned off sitealizer by default to make things go online

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 01722e6b3507c63c56d6818cdc6d243c3a8fc687..a71d7b4626c7ae26ebb8bd18a112908da3c2e680 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,21 +1,19 @@
-# 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.
 
 class ApplicationController < ActionController::Base
-  # add authentication methods and hooks
   include AuthenticatedSystem
   helper :user
   require_dependency "user"
 
-  # add sitealizer statistics and tracking information
   include Sitealizer
-  
-  before_filter :use_sitealizer, :add_stylesheets
+  before_filter :add_stylesheets
+  #before_filter :use_sitealizer
    
   def initialize
     @stylesheets = []
-    
+
+        
     # this is defined is a sketchy way in the sitealizer mixin
     # initalize. since i'm overloading that, i'm calling it here
     $visits = [] unless $visits

diff --git a/test/functional/quickvote_controller_test.rb b/test/functional/quickvote_controller_test.rb
index fbeb4a53a0dadf20ae1cd50be68fc41208ec1098..60ddb1b86f036e66362074f755914f90dc9cfa72 100644 (file)
--- a/test/functional/quickvote_controller_test.rb
+++ b/test/functional/quickvote_controller_test.rb
@@ -60,7 +60,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
 
   def test_get_quickvote_nonexistent
     get :index, { 'ident' => "idontexist" }
-    assert_redirected_to :controller => 'site'
+    assert_redirected_to :controller => 'front'
   end
 
   def test_get_result_empty_vote
@@ -72,7 +72,7 @@ class QuickvoteControllerTest < Test::Unit::TestCase
   def test_get_result_nonexistent
     test_create_quickvote
     get :results, { 'ident' => 'asdflaksdjf' }
-    assert_redirected_to :controller => 'site'
+    assert_redirected_to :controller => 'front'
   end
 
   def test_get_result_with_a_vote