Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/account_controller.rb

@@ -277,18 +277,9 @@ class AccountController < ApplicationController
     end
     call_hook(:controller_account_success_authentication_after, {:user => user })
     #by young
-    code = //
+#    redirect_back_or_default my_page_path
-    #根据home_url生产正则表达式
+    redirect_back_or_default User.current
-    class_eval("code = " + "/" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index)?\/")
+#    redirect_to User.current
-    if code.match(params[:back_url])
-         redirect_to user_activities_path(user)
-    else
-      #redirect_back_or_default my_page_path
-      redirect_back_or_default User.current
-      #redirect_to User.current
-    end
-
-
   end
 
   def set_autologin_cookie(user)