From ea45e44e101e15dea002b53043a55b63cf87bf0e Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 29 Jan 2020 23:35:26 -0600
Subject: [PATCH] search: remove legacy 'search[sort]' params.

Remove support for the `search[sort]` param on certain index pages. This
hasn't been used for years, and it caused the `search[order]=` param to
be added to pagination links even when the order was blank.
---
 app/models/artist.rb         | 1 -
 app/models/artist_version.rb | 1 -
 app/models/pool.rb           | 1 -
 app/models/tag.rb            | 1 -
 app/models/wiki_page.rb      | 1 -
 5 files changed, 5 deletions(-)

diff --git a/app/models/artist.rb b/app/models/artist.rb
index f85bcc044..c6f6c69f1 100644
--- a/app/models/artist.rb
+++ b/app/models/artist.rb
@@ -502,7 +502,6 @@ class Artist < ApplicationRecord
         q = q.includes(:tag).where("tags.name IS NULL OR tags.post_count <= 0").references(:tags)
       end
 
-      params[:order] ||= params.delete(:sort)
       case params[:order]
       when "name"
         q = q.order("artists.name")
diff --git a/app/models/artist_version.rb b/app/models/artist_version.rb
index 3a75a4168..bfd9a92a9 100644
--- a/app/models/artist_version.rb
+++ b/app/models/artist_version.rb
@@ -11,7 +11,6 @@ class ArtistVersion < ApplicationRecord
 
       q = q.search_attributes(params, :updater, :is_active, :is_banned, :artist_id, :name, :group_name)
 
-      params[:order] ||= params.delete(:sort)
       if params[:order] == "name"
         q = q.order("artist_versions.name").default_order
       else
diff --git a/app/models/pool.rb b/app/models/pool.rb
index 96a3822ac..32d6744d9 100644
--- a/app/models/pool.rb
+++ b/app/models/pool.rb
@@ -70,7 +70,6 @@ class Pool < ApplicationRecord
         q = q.collection
       end
 
-      params[:order] ||= params.delete(:sort)
       case params[:order]
       when "name"
         q = q.order("pools.name")
diff --git a/app/models/tag.rb b/app/models/tag.rb
index d1637db2d..e6cec3c50 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -853,7 +853,6 @@ class Tag < ApplicationRecord
         q = q.joins("LEFT JOIN artists ON tags.name = artists.name").where("artists.name IS NULL OR artists.is_active = false")
       end
 
-      params[:order] ||= params.delete(:sort)
       case params[:order]
       when "name"
         q = q.order("name")
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 7df94325b..a153bb8b2 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -101,7 +101,6 @@ class WikiPage < ApplicationRecord
         q = q.where("other_names is null or other_names = '{}'")
       end
 
-      params[:order] ||= params.delete(:sort)
       case params[:order]
       when "title"
         q = q.order("title")