From 5ab03af47a9fde0535f98f6d1837fc5142971d33 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 16 Apr 2013 08:50:40 -0400
Subject: [PATCH 1/4] fixes #1346

---
 app/assets/stylesheets/specific/posts.css.scss      | 7 +++++++
 app/views/posts/partials/show/_information.html.erb | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/specific/posts.css.scss b/app/assets/stylesheets/specific/posts.css.scss
index 550791fe2..674ceb760 100644
--- a/app/assets/stylesheets/specific/posts.css.scss
+++ b/app/assets/stylesheets/specific/posts.css.scss
@@ -247,6 +247,13 @@ div#c-posts {
       margin-right: 7em;
     }
 
+    #favlist {
+      margin-left: 1.5em;
+      word-wrap: break-word;
+      max-height: 200px;
+      overflow: auto;
+    }
+
     #pool-nav, #search-seq-nav, #nav-help {
       li {
         position: relative;
diff --git a/app/views/posts/partials/show/_information.html.erb b/app/views/posts/partials/show/_information.html.erb
index bf01f250f..7bfa25cdd 100644
--- a/app/views/posts/partials/show/_information.html.erb
+++ b/app/views/posts/partials/show/_information.html.erb
@@ -18,7 +18,7 @@
   <% if CurrentUser.is_privileged? && post.fav_count > 0 %>
     <%= link_to "&raquo;".html_safe, favorites_path(:post_id => post.id), :remote => true, :id => "show-favlist-link" %>
     <%= link_to "&laquo;".html_safe, "#", :id => "hide-favlist-link" %>
-    <div id="favlist" style="margin-left:1.5em; word-wrap:break-word"></div>
+    <div id="favlist"></div>
   <% end %></li>
   <li>
     Status:

From 458f4110210155e2a01899a86b483c389357b98f Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 16 Apr 2013 13:49:39 -0400
Subject: [PATCH 2/4] fixes #1311

---
 app/logical/d_text.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 9349520db..8abc81398 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -80,6 +80,8 @@ class DText
     str = str.gsub(/\bpool #(\d+)/i, %{<a href="/pools/\\1">pool #\\1</a>})
     str = str.gsub(/\buser #(\d+)/i, %{<a href="/users/\\1">user #\\1</a>})
     str = str.gsub(/\bartist #(\d+)/i, %{<a href="/artists/\\1">artist #\\1</a>})
+    str = str.gsub(/\bpixiv #(\d+)(?!\/p\d|\d)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id=\\1">pixiv #\\1</a>})
+    str = str.gsub(/\bpixiv #(\d+)\/p(\d+)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=manga_big&illust_id=\\1&page=\\2">pixiv #\\1/p\\2</a>})
   end
 
   def self.parse_list(str, options = {})

From d9bf3314d16b26cfa7cbad91b82d203db31fd7dd Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 16 Apr 2013 13:53:36 -0400
Subject: [PATCH 3/4] fixes #1131

---
 app/logical/d_text.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 8abc81398..ba353288c 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -80,6 +80,7 @@ class DText
     str = str.gsub(/\bpool #(\d+)/i, %{<a href="/pools/\\1">pool #\\1</a>})
     str = str.gsub(/\buser #(\d+)/i, %{<a href="/users/\\1">user #\\1</a>})
     str = str.gsub(/\bartist #(\d+)/i, %{<a href="/artists/\\1">artist #\\1</a>})
+    str = str.gsub(/\bissue #(\d+)/i, %{<a href="https://github.com/r888888888/danbooru/issues/\\1">issue #\\1</a>})
     str = str.gsub(/\bpixiv #(\d+)(?!\/p\d|\d)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=medium&illust_id=\\1">pixiv #\\1</a>})
     str = str.gsub(/\bpixiv #(\d+)\/p(\d+)/i, %{<a href="http://www.pixiv.net/member_illust.php?mode=manga_big&illust_id=\\1&page=\\2">pixiv #\\1/p\\2</a>})
   end

From 64eeab33960674a8b0274b7367ead48f55a884e8 Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Tue, 16 Apr 2013 22:59:41 -0400
Subject: [PATCH 4/4] partial fix for #1354

---
 app/models/tag.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index a5172d6f8..84c8fd610 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -187,7 +187,7 @@ class Tag < ActiveRecord::Base
         end
 
       when :age
-        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)/i
+        object =~ /(\d+)(s(econds?)?|mi(nutes?)?|h(ours?)?|d(ays?)?|w(eeks?)?|mo(nths?)?|y(ears?)?)?/i
 
         size = $1.to_i
         unit = $2