diff --git a/app/models/comment.rb b/app/models/comment.rb index eb10fab60..604bcd6f5 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -37,7 +37,7 @@ class Comment < ActiveRecord::Base end def for_creator_name(user_name) - where("creator_id = (select _.id from users _ where lower(_.name) = lower(?))", user_name.downcase) + where("creator_id = (select _.id from users _ where lower(_.name) = lower(?))", user_name.mb_chars.downcase) end def search(params) @@ -53,7 +53,7 @@ class Comment < ActiveRecord::Base end if params[:creator_name].present? - q = q.for_creator_name(params[:creator_name]) + q = q.for_creator_name(params[:creator_name].tr(" ", "_")) end if params[:creator_id].present? diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb index c0fec63b1..8f2c52043 100644 --- a/app/models/forum_post.rb +++ b/app/models/forum_post.rb @@ -22,7 +22,7 @@ class ForumPost < ActiveRecord::Base end def creator_name(name) - where("forum_posts.creator_id = (select _.id from users _ where lower(_.name) = ?)", name.downcase) + where("forum_posts.creator_id = (select _.id from users _ where lower(_.name) = ?)", name.mb_chars.downcase) end def active @@ -50,7 +50,7 @@ class ForumPost < ActiveRecord::Base end if params[:creator_name].present? - q = q.creator_name(params[:creator_name]) + q = q.creator_name(params[:creator_name].tr(" ", "_")) end q diff --git a/app/models/note.rb b/app/models/note.rb index ec36dde35..7ab277a15 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -27,7 +27,7 @@ class Note < ActiveRecord::Base end def creator_name(name) - where("creator_id = (select _.id from users _ where lower(_.name) = ?)", name.downcase) + where("creator_id = (select _.id from users _ where lower(_.name) = ?)", name.mb_chars.downcase) end def search(params) @@ -47,7 +47,7 @@ class Note < ActiveRecord::Base end if params[:creator_name].present? - q = q.creator_name(params[:creator_name]) + q = q.creator_name(params[:creator_name].tr(" ", "_")) end if params[:creator_id].present? diff --git a/app/models/pool.rb b/app/models/pool.rb index 0770332c6..809367773 100644 --- a/app/models/pool.rb +++ b/app/models/pool.rb @@ -35,7 +35,7 @@ class Pool < ActiveRecord::Base end if params[:creator_name].present? - q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase) + q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].tr(" ", "_").mb_chars.downcase) end if params[:creator_id].present? diff --git a/app/models/tag.rb b/app/models/tag.rb index 9b9f4568c..1ea5cb822 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -440,7 +440,7 @@ class Tag < ActiveRecord::Base params = {} if params.blank? if params[:name_matches].present? - q = q.name_matches(params[:name_matches].strip) + q = q.name_matches(params[:name_matches].strip.tr(" ", "_")) end if params[:category].present? diff --git a/app/models/user.rb b/app/models/user.rb index cf9fc4e32..9e04de7b9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -74,7 +74,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) + select_value_sql("SELECT id FROM users WHERE lower(name) = ?", name.mb_chars.downcase.tr(" ", "_")) end end @@ -545,11 +545,11 @@ class User < ActiveRecord::Base return q if params.blank? if params[:name].present? - q = q.name_matches(params[:name].mb_chars.downcase) + q = q.name_matches(params[:name].mb_chars.downcase.tr(" ", "_")) end if params[:name_matches].present? - q = q.name_matches(params[:name_matches].mb_chars.downcase) + q = q.name_matches(params[:name_matches].mb_chars.downcase.tr(" ", "_")) end if params[:min_level].present? diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 886495f24..b991b1dd5 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -42,7 +42,7 @@ class WikiPage < ActiveRecord::Base end if params[:creator_name].present? - q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].downcase) + q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].tr(" ", "_").mb_chars.downcase) end if params[:sort] == "time" || params[:sort] == "Date"