Merge branch 'devel' of github.com:huacnlee/quora into devel

xufeng · Apr 5, 2011 · 8803d01 · 8803d01
2 parents eec3676 + dd993c5
commit 8803d01
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 class HomeController < ApplicationController
   before_filter :require_user_text, :only => [:update_in_place]
-  before_filter :require_user
+  before_filter :require_user, :except => [:about]
 
   def index
     # @per_page = 20

diff --git a/app/models/ask.rb b/app/models/ask.rb
@@ -123,7 +123,7 @@ def update_topics(topics, add = true, current_user_id)
     end
 
     self.current_user_id = current_user_id
-    self.topics = self.topics.uniq
+    self.topics = self.topics.uniq { |s| s.downcase }
     self.update(:topics => self.topics)
     insert_topic_action_log(action, topics, current_user_id)
   end

diff --git a/app/models/topic.rb b/app/models/topic.rb
@@ -51,7 +51,7 @@ def self.save_topics(topics, current_user_id)
   end
 
   def self.find_by_name(name)
-    find(:first,:conditions => {:name => name})
+    find(:first,:conditions => {:name => /^#{name}$/i})
   end
 
   def self.search_name(name, options = {})