From 244de985c6c00b6385e9af47f9dec08de1eec6c5 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Tue, 29 May 2012 08:57:01 +0200
Subject: Include html_safe an ready? in ApplicationMap#to_html

---
 app/maps/application_map.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/maps/application_map.rb')

diff --git a/app/maps/application_map.rb b/app/maps/application_map.rb
index a4d8a84ab..dffb2501c 100644
--- a/app/maps/application_map.rb
+++ b/app/maps/application_map.rb
@@ -34,7 +34,9 @@ class ApplicationMap
   end
 
   def to_html(options = {})
-    "<div id=\"#{id}\" class=\"#{default_class}\"></div> #{map.to_html(options)}"
+    if not respond_to?(:ready?) or ready?
+      "<div id=\"#{id}\" class=\"#{default_class}\"></div> #{map.to_html(options)}".html_safe
+    end
   end
 
   def kml
-- 
cgit v1.2.3