From 75fdaa496ead9947f0b4c9059d121330e34003a5 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 7 May 2013 01:40:15 -0700 Subject: [PATCH 1/2] Revert "fixes #1438" This reverts commit 1d0c77dc7c4fd6614cf5c8232cdd16254ab4ec09. --- app/models/artist_url.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/artist_url.rb b/app/models/artist_url.rb index e166798da..834b0921b 100644 --- a/app/models/artist_url.rb +++ b/app/models/artist_url.rb @@ -11,8 +11,8 @@ class ArtistUrl < ActiveRecord::Base url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2") - url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img.pixiv.net") - url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://img.pixiv.net") + url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img.pixiv.net") + url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://img.pixiv.net") url = url.gsub(/\/+\Z/, "") url + "/" end @@ -27,8 +27,8 @@ class ArtistUrl < ActiveRecord::Base url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2") - url = url.gsub(/^http:\/\/img\d+\.pixiv\.net\/img/, "http://img*.pixiv.net") - url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+\/img/, "http://*.pixiv.net/img*") + url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img*.pixiv.net") + url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://*.pixiv.net/img*") end def normalize From 4878b692ad3c05f5916fa554e9b8f5189a2f235b Mon Sep 17 00:00:00 2001 From: r888888888 Date: Tue, 7 May 2013 01:40:40 -0700 Subject: [PATCH 2/2] update version --- config/danbooru_default_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb index fb4a22fdf..e13148345 100644 --- a/config/danbooru_default_config.rb +++ b/config/danbooru_default_config.rb @@ -4,7 +4,7 @@ module Danbooru class Configuration # The version of this Danbooru. def version - "2.9.0" + "2.9.1" end # The name of this Danbooru.