X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/d857bfeff0568003715939fab8aa2925261272a6..c35eb01007440d21ded1ec10e56406108fe44294:/app/models/election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index cd809ab..99d64f9 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 defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+    if 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 defined? Cache
+    elsif Cache
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)