From f94d29714942c387f8f63336e1b000f6a64d17b2 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Fri, 12 Jun 2015 12:07:50 -0400
Subject: [PATCH] #2404 fix artist finder

---
 app/assets/javascripts/related_tag.js | 5 +++--
 app/controllers/artists_controller.rb | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/related_tag.js b/app/assets/javascripts/related_tag.js
index ba7c6ce8f..32d8f7b12 100644
--- a/app/assets/javascripts/related_tag.js
+++ b/app/assets/javascripts/related_tag.js
@@ -253,8 +253,9 @@
 
   Danbooru.RelatedTag.find_artist = function(e) {
     $("#artist-tags").html("<em>Loading...</em>");
-    var url = $("#referer_url,#upload_source,#post_source");
-    $.get("/artists/finder.json", {"url": url.val()}).success(Danbooru.RelatedTag.process_artist);
+    var url = $("#upload_source,#post_source");
+    var referer_url = $("#referer_url");
+    $.get("/artists/finder.json", {"url": url.val(), "referer_url": referer_url.val()}).success(Danbooru.RelatedTag.process_artist);
     e.preventDefault();
   }
 
diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index f72be2ce1..fb5f839a3 100644
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -119,6 +119,9 @@ class ArtistsController < ApplicationController
 
   def finder
     @artists = Artist.url_matches(params[:url]).order("id desc").limit(20)
+    if @artists.empty? && params[:referer_url].present? && params[:referer_url] != params[:url]
+      @artists = Artist.url_matches(params[:referer_url]).order("id desc").limit(20)
+    end
     respond_with(@artists) do |format|
       format.xml do
         render :xml => @artists.to_xml(:include => [:urls], :root => "artists")