Commit ccb87e13 authored by evazion's avatar evazion

Fix #4282: Related tag search no longer allows the JSON/XML formats.

parent 2d0e0769
......@@ -18,7 +18,7 @@ module Moderator
@posts = ::Post.includes(:disapprovals, :uploader).order("posts.id asc").pending_or_flagged.available_for_moderation(search_params[:hidden]).tag_match(search_params[:tags]).paginate(params[:page], :limit => per_page)
@posts.each # hack to force rails to eager load
end
#respond_with(@posts)
respond_with(@posts)
end
def random
......
......@@ -6,6 +6,6 @@ class RelatedTagsController < ApplicationController
category = params[:category] || search_params[:category]
@query = RelatedTagQuery.new(query: query, category: category, user: CurrentUser.user)
#respond_with(@query)
respond_with(@query)
end
end
......@@ -217,7 +217,7 @@ module ApplicationHelper
def body_attributes(user, params, current_item = nil)
current_user_data_attributes = data_attributes_for(user, "current-user", current_user_attributes)
if params[:action] == "show" && current_item.present?
if current_item.present? && current_item.respond_to?(:html_data_attributes) && current_item.respond_to?(:model_name)
model_name = current_item.model_name.singular.dasherize
model_attributes = current_item.html_data_attributes
current_item_data_attributes = data_attributes_for(current_item, model_name, model_attributes)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment