FIX: Keep around the page when redirecting

discourse · May 20, 2015 · 7d23826 · 7d23826
1 parent 3859273
commit 7d23826
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
@@ -439,6 +439,9 @@ def redirect_to_correct_topic(topic, post_number=nil)
     url << "/#{post_number}" if post_number.to_i > 0
     url << ".json" if request.format.json?
 
+    page = params[:page].to_i
+    url << "?page=#{page}" if page != 0
+
     redirect_to url, status: 301
   end
 

diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
@@ -532,6 +532,11 @@
       expect(response).to redirect_to(topic.relative_url + "/42")
     end
 
+    it 'keeps the page around when redirecting' do
+      xhr :get, :show, id: topic.slug, post_number: 42, page: 123
+      expect(response).to redirect_to(topic.relative_url + "/42?page=123")
+    end
+
     it 'returns 404 when an invalid slug is given and no id' do
       xhr :get, :show, id: 'nope-nope'
       expect(response.status).to eq(404)