Permalink
Browse files

update ferret_server settings

  • Loading branch information...
1 parent cf7fbbd commit dc4f5a511488663f96c0ea2a24943ceb7a43b403 @poojagupta poojagupta committed Jul 14, 2009
Showing with 5 additions and 5 deletions.
  1. +3 −3 app/controllers/fb_connect_controller.rb
  2. +1 −1 app/models/user.rb
  3. +1 −1 config/ferret_server.yml
@@ -24,12 +24,12 @@ def connect
if @u && !@u.email_verified
reset_session
flash[:error] = 'Your email address has not yet been confirmed.'
- return redirect_back_or_default home_path
+ return redirect_back_or_default(home_path)
elsif @u && @u.email_verified
flash[:notice] = "Hello #{@u.full_name}"
- return redirect_back_or_default profile_path(@u.profile)
+ return redirect_back_or_default(profile_path(@u.profile))
else
- return redirect_to signup_path.add_param({:fb_user => true})
+ return redirect_to(signup_path.add_param({:fb_user => true}))
end
end
end
View
@@ -228,7 +228,7 @@ def request_email_change!(new_email)
# before filter
def encrypt_password
- return if password.blank? && is_facebook_user?
+ return if password.blank? || is_facebook_user?
self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if
new_record? || @forgot
self.crypted_password = encrypt(password)
@@ -1,5 +1,5 @@
d___evelopment:
port: 12005
-production:
+p_________________roduction:
port: 10050
pid_file: log/ferret.pid

0 comments on commit dc4f5a5

Please sign in to comment.