Use cache store for sessions when memcached is not available

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b256dac4c8fca11a91a95c16658138b5bb20fa55..ce0c5d67bb68d37945d0d42213e92d3ef1f08373 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -89,7 +89,7 @@ module ApplicationHelper
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     begin
     url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
 
     begin

-      response = Timeout::timeout(4) do
+      response = OSM::Timer.timeout(4) do

         REXML::Document.new(Net::HTTP.get(URI.parse(url)))
       end
     rescue Exception
         REXML::Document.new(Net::HTTP.get(URI.parse(url)))
       end
     rescue Exception


@@ -106,21 +106,13 @@ module ApplicationHelper
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 
   def user_image(user, options = {})
     options[:class] ||= "user_image"
 

-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_large.png", options
-    end
+    image_tag user.image.url(:large), options

   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 
   end
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
 

-    if user.image
-      image_tag url_for_file_column(user, "image"), options
-    else
-      image_tag "anon_small.png", options
-    end
+    image_tag user.image.url(:small), options

   end
 
   def preferred_editor
   end
 
   def preferred_editor