Merge branch 'guange_dev' into develop

app/helpers/application_helper.rb

@@ -34,13 +34,6 @@ module ApplicationHelper
   def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
 
 
-  def user_path(resource, parameters = {})
-    if Fixnum ===  resource
-      resource = User.find(resource)
-    end
-    super
-  end
-
   # def user_blogs_path(resource,parameters={})
   #   super
   # end

app/models/user.rb

@@ -1103,9 +1103,6 @@ class User < Principal
     # super
   end
 
-  def to_param
-    login
-  end
   # Salts all existing unsalted passwords
   # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
   # This method is used in the SaltPasswords migration and is to be kept as is