added the ability to add safe html tags to input (i.e., images)

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index cd809ab5b94e28a06c6ed4cdbaaaacaf4cc90148..99d64f93cc55424b34f82dac24d0dce9a1e4fc73 100644 (file)
--- 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
   #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
       @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)
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)