X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/f2db874f06622e5b7422dabc8e17396708277c56..45532efec547148def34ac29a1ea1c9652420d37:/app/models/election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 99d64f9..cd809ab 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -91,14 +91,14 @@ class Election < ActiveRecord::Base
   #Calculate results if not in memcache
   def results
     # Assignment is intentional
-    if Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+    if defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
       @plurality_result = c['plurality']
       @approval_result = c['approval']
       @condorcet_result = c['condorcet']
       @ssd_result = c['ssd']
       @borda_result = c['borda']
       return c
-    elsif Cache
+    elsif defined? Cache
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)