From 84d0b599a4720f74884db9d1e69b388bbb5bec5f Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 29 Aug 2014 23:09:02 +0530 Subject: [PATCH] FIX: do not redirect topic for JSON request --- app/controllers/topics_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 58d220525ce..13315eadafd 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -52,7 +52,7 @@ class TopicsController < ApplicationController discourse_expires_in 1.minute - redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) && return if slugs_do_not_match || (!request.xhr? && params[:slug].nil?) + redirect_to_correct_topic(@topic_view.topic, opts[:post_number]) && return if slugs_do_not_match || (!request.format.json? && params[:slug].nil?) track_visit_to_topic @@ -404,7 +404,7 @@ class TopicsController < ApplicationController username: request['u'], ip_address: request.remote_ip ) - end unless request.xhr? + end unless request.format.json? Scheduler::Defer.later "Track Visit" do TopicViewItem.add(topic_id, ip, user_id) @@ -416,7 +416,7 @@ class TopicsController < ApplicationController end def should_track_visit_to_topic? - !!((!request.xhr? || params[:track_visit]) && current_user) + !!((!request.format.json? || params[:track_visit]) && current_user) end def perform_show_response