Merge from jdong

[selectricity] / app / views / quickvote / results.rhtml

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 7ab73efc23926bfc73db059bb5421d4b30e31be0..9727d81289e6690597f298f4d5a0d8bb4a545e5e 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -53,7 +53,7 @@
     <td><% begin %>
         <% raise ArgumentError.new, "Local Server" if voter.ipaddress == "127.0.0.1" %>
         <% raise ArgumentError.new, "XML-RPC Voter" if voter.ipaddress == "XMLRPC Request" %>
-        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress).to_s,true)%>
+        <% w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)%>
         <%=h((w.host == nil or w.host.empty?) ? voter.ipaddress : w.host)%>
       </td>
       <td>
@@ -64,6 +64,10 @@
       <%=h err %>
     </td>
     <td><%=h err%>
+    <% rescue NoMethodError %>
+      DNS Unreachable
+    </td>
+    <td> DNS Unreachable
     <% end %>
     </td>
   <td><%= voter.vote.votestring %></td>