From 53a9d2929241dfe4884af4ed6f295bcdfce1b4d6 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Thu, 15 May 2014 17:41:45 +0800
Subject: [PATCH 1/3] Revert "acount"

This reverts commit 03dbcb116879dcda1b8f51cfafa316534e4c3c98.
---
 app/controllers/account_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 38afb7a28..5f20ec912 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -31,9 +31,9 @@ class AccountController < ApplicationController
     else
       authenticate_user
     end
-  rescue AuthSourceException => e
-    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
-    render_error :message => e.message
+  #rescue AuthSourceException => e
+  #  logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
+   # render_error :message => e.message
   end
 
   # Log out current user and redirect to welcome page

From be87e02e4c5c89d88e528a0c45236238ae2fb762 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Thu, 15 May 2014 17:41:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=E4=BB=8E=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E6=97=B6=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a794d612afe07a4332a1e5e76b3e9667b0cd6454.
---
 app/controllers/account_controller.rb | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 5f20ec912..cf39898fe 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -31,9 +31,9 @@ class AccountController < ApplicationController
     else
       authenticate_user
     end
-  #rescue AuthSourceException => e
-  #  logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
-   # render_error :message => e.message
+  rescue AuthSourceException => e
+    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
+    render_error :message => e.message
   end
 
   # Log out current user and redirect to welcome page
@@ -277,18 +277,9 @@ class AccountController < ApplicationController
     end
     call_hook(:controller_account_success_authentication_after, {:user => user })
     #by young
-    code = //
-    #根据home_url生产正则表达式
-    class_eval("code = " + "/" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index)?\/")
-    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
-
-
+#    redirect_back_or_default my_page_path
+    redirect_back_or_default User.current
+#    redirect_to User.current
   end
 
   def set_autologin_cookie(user)

From 09eae52fc1ff24512ca48fbd238f22f419c4c44e Mon Sep 17 00:00:00 2001
From: t430 <senluowanxiangt@163.com>
Date: Thu, 15 May 2014 19:09:35 +0800
Subject: [PATCH 3/3] hard picture file

---
 public/images/edit.png                | Bin 522 -> 0 bytes
 public/images/{Edit => edit}/edit.png | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 public/images/edit.png
 rename public/images/{Edit => edit}/edit.png (100%)

diff --git a/public/images/edit.png b/public/images/edit.png
deleted file mode 100644
index 8335716fd5f9994eca802b8b14fb43c667bcc034..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 522
zcmV+l0`>igP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005eNkl<ZILl-B
z|NlP&C738h{r&x5{NKe_`@fUV-2awN_HQhlNH#$JzlG!6{~Ndd|7qs1^OdEuGf@V-
zJZ{NwbVGD>Pft(g&!0d4|DQhl|Nrg@{~ubrZp3Q<NFx{@vn+Ug!1^gj^Syib{=a<r
z^8Yah_pLW<9E}JYaLm%-=^?Av|K9^GyXOtooR*f>+~ymoxxm8*H4N^pv1Yip)*8iT
zxaN1O|Nnnp_5bP)+t({+c&Ek2#xlS#b^{<bZwG6BGynhp7ft`~?Xf=e_@I@`i{n-d
z_zghT{IcW!|7R`#uWq&dcw?JQ`J?^T4EPOLW3B#Zuk|vp=4XvST>t;j635SH*4VjT
z*<#CZXO|5F$dCp79t`2(;b06m;ObIawo8j`bN;_O^Zx&%B%tP+|GVZnojSDGvFh|1
zI|h&eGrK(D8Zitwy}-`$|HbSB|394j|NrT#ubU=2AKo#?$-T4Mhhb8qH-<(G1NP2z
zY6WXP6?Ab`x9hCl3ZDR=0#P6q#-$m>03hf8sxH@A9c8}B$+01(K)x;zYXPwd5c2~u
zFA#G9F$WN{0Wk{@GZRe8Kt+l`EDOYvKr8~p0zk|SGl-(B3^afV01ba!p4w(>hyVZp
M07*qoM6N<$f^G@~i~s-t

diff --git a/public/images/Edit/edit.png b/public/images/edit/edit.png
similarity index 100%
rename from public/images/Edit/edit.png
rename to public/images/edit/edit.png