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

Merge pull request #361 from ZogStriP/enforce-coding-convention

Browse Source 
enforce coding convention
This commit is contained in:
Robin Ward
2013-03-05 07:25:19 -08:00
parent 3cf3fee781 239cbd2d58
commit 0c5ca30188
39 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/list_controller.rb
View File

@ -10,7 +10,7 @@ class ListController < ApplicationController
list_opts = {page: params[:page]}
# html format means we need to farm exclude from the site options
if params[:format].blank? or params[:format] == "html"
if params[:format].blank? || params[:format] == "html"
#TODO objectify this stuff
SiteSetting.top_menu.split('|').each do |f|
s = f.split(",")
@ -35,7 +35,7 @@ class ListController < ApplicationController
list = nil
# If they choose uncategorized, return topics NOT in a category
if params[:category] == Slug.for(SiteSetting.uncategorized_name) or params[:category] == SiteSetting.uncategorized_name
if params[:category] == Slug.for(SiteSetting.uncategorized_name) || params[:category] == SiteSetting.uncategorized_name
list = query.list_uncategorized
else
@category = Category.where("slug = ? or id = ?", params[:category], params[:category].to_i).includes(:featured_users).first