fix feed JSON rendering

2014-07-24 12:26:57 -04:00 · 2014-07-24 12:26:57 -04:00 · 79c96cffcd
commit 79c96cffcd
parent 937d2eea47
1 changed files with 1 additions and 1 deletions
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@ -119,7 +119,7 @@ class Feed < ActiveRecord::Base

  # custom json output
  def as_json(options = {})
-    super(Feed.public_options)
+    super(Feed.public_options.merge(options))
  end

  # check if a field value is a number