X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/07c4c28f94d7628c0d5c48db810956f680c5f48e..eed173db706db097ec48a83059d9879a56e2dd4b:/app/controllers/quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index cc57bb5..eef3402 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -115,7 +115,7 @@ class QuickvoteController < ApplicationController
 	      @voter.reload
       end
     else
-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'
     end
   end
 
@@ -169,8 +169,8 @@ class QuickvoteController < ApplicationController
     @election.voters.each do |voter|
       next unless voter.ipaddress
       location=nil
-      if Cache and location=Cache.get("GEO:#{voter.ipaddress}")
-      elsif Cache
+      if defined? Cache and location=Cache.get("GEO:#{voter.ipaddress}")
+      elsif defined? Cache
         location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
         Cache.set "GEO:#{voter.ipaddress}", location
       else
@@ -198,7 +198,7 @@ class QuickvoteController < ApplicationController
   def results
     unless @election = QuickVote.ident_to_quickvote(params[:ident])
       flash[:notice] = "Cannot find quickvote #{params[:ident]}."
-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'
       return
     end
     if @election.viewable == 0 && @election.active == 1