update ferret_server settings

risingsun · Jul 14, 2009 · dc4f5a5 · dc4f5a5
1 parent cf7fbbd
commit dc4f5a5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/fb_connect_controller.rb b/app/controllers/fb_connect_controller.rb
@@ -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

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -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)

diff --git a/config/ferret_server.yml b/config/ferret_server.yml
@@ -1,5 +1,5 @@
 d___evelopment:
   port: 12005
-production:
+p_________________roduction:
   port: 10050
   pid_file: log/ferret.pid