lib/onebox/engine/image_onebox.rb in onebox-1.6.5 vs lib/onebox/engine/image_onebox.rb in onebox-1.6.6

@@ -1,11 +1,11 @@
 module Onebox
   module Engine
     class ImageOnebox
       include Engine
 
-      matches_regexp /^(https?:)?\/\/.+\.(png|jpg|jpeg|gif|bmp|tif|tiff)(\?.*)?$/i
+      matches_regexp(/^(https?:)?\/\/.+\.(png|jpg|jpeg|gif|bmp|tif|tiff)(\?.*)?$/i)
 
       def always_https?
         WhitelistedGenericOnebox.host_matches(uri, WhitelistedGenericOnebox.https_hosts)
       end
 
@@ -13,10 +13,10 @@
         # Fix Dropbox image links
         if /^https:\/\/www.dropbox.com\/s\//.match @url
           @url.gsub!("https://www.dropbox.com","https://dl.dropboxusercontent.com")
         end
 
-        escaped = url.gsub(/'/, "%27")
+        escaped = Onebox::Helpers.normalize_url_for_output(url)
         "<a href='#{escaped}' target='_blank'><img src='#{escaped}'></a>"
       end
     end
   end
 end