From cb1b021c2cc63bc7ad24bd9b00361709ed314696 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 30 Mar 2013 11:51:17 -0400 Subject: [PATCH] fixes #1136 (and a few other cases) --- app/logical/daily_maintenance.rb | 1 + app/models/artist.rb | 2 +- app/models/user.rb | 2 +- app/models/wiki_page.rb | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/logical/daily_maintenance.rb b/app/logical/daily_maintenance.rb index 670778a6a..27e2332f2 100644 --- a/app/logical/daily_maintenance.rb +++ b/app/logical/daily_maintenance.rb @@ -5,6 +5,7 @@ class DailyMaintenance Upload.delete_all(['created_at < ?', 1.day.ago]) ModAction.delete_all(['created_at < ?', 3.days.ago]) Delayed::Job.delete_all(['created_at < ?'], 1.day.ago) + ApiCacheGenerator.new.generate_tag_cache end def prune_ad_hits diff --git a/app/models/artist.rb b/app/models/artist.rb index b747eeefe..798174795 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -58,7 +58,7 @@ class Artist < ActiveRecord::Base module ClassMethods def normalize_name(name) - name.to_s.mb_chars.downcase.strip.gsub(/ /, '_') + name.to_s.mb_chars.downcase.strip.gsub(/ /, '_').to_s end end diff --git a/app/models/user.rb b/app/models/user.rb index a509c2c90..eb6b8ebac 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -76,7 +76,7 @@ class User < ActiveRecord::Base module ClassMethods def name_to_id(name) Cache.get("uni:#{Cache.sanitize(name)}", 4.hours) do - select_value_sql("SELECT id FROM users WHERE lower(name) = ?", name.mb_chars.downcase.tr(" ", "_")) + select_value_sql("SELECT id FROM users WHERE lower(name) = ?", name.mb_chars.downcase.tr(" ", "_")).to_s end end diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index a372545d6..c72658ad2 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -156,6 +156,6 @@ class WikiPage < ActiveRecord::Base else match end - end.map {|x| x.mb_chars.downcase.tr(" ", "_")} + end.map {|x| x.mb_chars.downcase.tr(" ", "_").to_s} end end