From f217b3f510a9facbe67eb2080d0efd059bb9e0fd Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 14 May 2016 16:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 7 -------
 app/models/user.rb                | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 229aceb1c..798dd4a3a 100644
--- a/app/helpers/application_helper.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index 035aff625..3956d936e 100644
--- a/app/models/user.rb
+++ b/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