Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5

This commit is contained in:
Harry Bomrah 2014-12-19 17:15:36 +08:00
commit 0e7e4180a6
1 changed files with 1 additions and 1 deletions

View File

@ -89,8 +89,8 @@ class PagesController < ApplicationController
categories << c
end
end
categories = ["all"] if categories.blank?
end
categories = ["all"] if categories.blank?
@manifest = @key
OrbitHelper.set_params params,current_user
OrbitHelper.set_site_locale locale