github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:21:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

enforce coding convention

Browse Source 
replaced every `and` by `&&` and every `or` by `||`
This commit is contained in:
Régis Hanol
2013-03-05 01:42:44 +01:00
parent f544e1d4f7
commit 239cbd2d58
39 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users/omniauth_callbacks_controller.rb
View File

@ -156,7 +156,7 @@ class Users::OmniauthCallbacksController < ApplicationController
user = user_open_id.user
# If we have to approve users
if SiteSetting.must_approve_users? and !user.approved?
if SiteSetting.must_approve_users? && !user.approved?
@data = {awaiting_approval: true}
else
log_on_user(user)
@ -222,7 +222,7 @@ class Users::OmniauthCallbacksController < ApplicationController
user = User.find_by_email(email)
if user
if SiteSetting.must_approve_users? and !user.approved?
if SiteSetting.must_approve_users? && !user.approved?
@data = {awaiting_approval: true}
else
log_on_user(user)