From 6683cf12e7d5dd327ad4e89b53bbae1e7a9b4085 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Sun, 3 Apr 2011 21:09:36 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E6=96=B0=E6=B5=AA=E5=B8=90=E5=8F=B7?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                             | 2 +-
 app/controllers/users_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1a1fb4b..349a633 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@ gem 'memcache-client'
 gem 'omniauth', '0.2.0.beta3'
 gem "oa-openid", '0.2.0.beta3'
 # gem "omniauth_china", :path => "/Users/jason/work/omniauth_china"
-gem "omniauth_china", :git => "git://github.com/huacnlee/omniauth_china.git"
+gem "omniauth_china", "0.0.6"
 
 # 后台列表
 # gem 'wice_grid', '3.0.0.pre1'
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5607ed1..9cf940f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 class UsersController < ApplicationController
   skip_before_filter :verify_authenticity_token, :only => [:auth_callback]
-  before_filter :init_user
+  before_filter :init_user, :except => [:auth_callback]
 
   def init_user
     @user = User.find_by_slug(params[:id])