enforce coding convention

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

View File

@@ -3,7 +3,7 @@ module ImageSizer
# Resize an image to the aspect ratio we want
def self.resize(width, height)
max_width = SiteSetting.max_image_width.to_f
return nil if width.blank? or height.blank?
return nil if width.blank? || height.blank?
w = width.to_f
h = height.to_f