github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 04:08:41 +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

2
app/controllers/session_controller.rb
View File

@ -15,7 +15,7 @@ class SessionController < ApplicationController
if @user.present?
# If the site requires user approval and the user is not approved yet
if SiteSetting.must_approve_users? and !@user.approved?
if SiteSetting.must_approve_users? && !@user.approved?
render :json => {error: I18n.t("login.not_approved")}
return
end