about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/atom_builder_helper.rb2
-rw-r--r--app/helpers/routing_helper.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index f71f0e83e..a98cb7b3b 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -214,6 +214,6 @@ module AtomBuilderHelper
   end
 
   def single_link_avatar(xml, account, size, px)
-    xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' =>px, 'href' => asset_url(account.avatar.url(size, false)))
+    xml.link('rel' => 'avatar', 'type' => account.avatar_content_type, 'media:width' => px, 'media:height' =>px, 'href' => full_asset_url(account.avatar.url(size, false)))
   end
 end
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index cd8132f07..101382604 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -1,11 +1,15 @@
 module RoutingHelper
   extend ActiveSupport::Concern
   include Rails.application.routes.url_helpers
-  include ActionView::Helpers::AssetUrlHelper
+  include ActionView::Helpers::AssetTagHelper
 
   included do
     def default_url_options
       ActionMailer::Base.default_url_options
     end
   end
+
+  def full_asset_url(source)
+    File.join(root_url, ActionController::Base.helpers.asset_url(source))
+  end
 end