From 6bbea9de0be9dda2502600c718f8fba6aa76e5f3 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 29 Nov 2013 21:43:44 -0800
Subject: [PATCH] The Rails JSON encoder API requires `as_json` to take an
 optional arg

---
 app/models/admin_dashboard_data.rb   | 2 +-
 app/models/incoming_links_report.rb  | 2 +-
 app/models/report.rb                 | 2 +-
 lib/search/grouped_search_results.rb | 2 +-
 lib/search/search_result.rb          | 2 +-
 lib/search/search_result_type.rb     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb
index 63026537711..36bd6ace98b 100644
--- a/app/models/admin_dashboard_data.rb
+++ b/app/models/admin_dashboard_data.rb
@@ -61,7 +61,7 @@ class AdminDashboardData
     AdminDashboardData.new.problems
   end
 
-  def as_json
+  def as_json(options = nil)
     @json ||= {
       reports: REPORTS.map { |type| Report.find(type).as_json },
       admins: User.admins.count,
diff --git a/app/models/incoming_links_report.rb b/app/models/incoming_links_report.rb
index add83cc5dad..4177576a595 100644
--- a/app/models/incoming_links_report.rb
+++ b/app/models/incoming_links_report.rb
@@ -8,7 +8,7 @@ class IncomingLinksReport
     @data = nil
   end
 
-  def as_json
+  def as_json(options = nil)
     {
       type: self.type,
       title: I18n.t("reports.#{self.type}.title"),
diff --git a/app/models/report.rb b/app/models/report.rb
index 1df58560c4e..3d83d84d044 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -11,7 +11,7 @@ class Report
     @prev30Days = nil
   end
 
-  def as_json
+  def as_json(options = nil)
     {
      type: self.type,
      title: I18n.t("reports.#{self.type}.title"),
diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb
index 6ba6267a561..82d9be0095b 100644
--- a/lib/search/grouped_search_results.rb
+++ b/lib/search/grouped_search_results.rb
@@ -15,7 +15,7 @@ class Search
       return topic_results.result_ids
     end
 
-    def as_json
+    def as_json(options = nil)
       @by_type.values.map do |grouped_result|
         grouped_result.as_json
       end
diff --git a/lib/search/search_result.rb b/lib/search/search_result.rb
index 17ef418da0d..0cc1105517c 100644
--- a/lib/search/search_result.rb
+++ b/lib/search/search_result.rb
@@ -15,7 +15,7 @@ class Search
       @url, @id, @title = row[:url], row[:id], row[:title]
     end
 
-    def as_json
+    def as_json(options = nil)
       json = {id: @id, title: @title, url: @url}
       json[:avatar_template] = @avatar_template if @avatar_template.present?
       json[:color] = @color if @color.present?
diff --git a/lib/search/search_result_type.rb b/lib/search/search_result_type.rb
index d720792209a..1baa9f15561 100644
--- a/lib/search/search_result_type.rb
+++ b/lib/search/search_result_type.rb
@@ -20,7 +20,7 @@ class Search
       @result_ids << result.id
     end
 
-    def as_json
+    def as_json(options = nil)
       { type: @type.to_s,
         name: I18n.t("search.types.#{@type.to_s}"),
         more: @more,