From 02f3f8c1b38bdd86838196d49a42eb498a7e4595 Mon Sep 17 00:00:00 2001 From: Lincoln Lee Date: Tue, 10 Feb 2015 00:48:42 +0800 Subject: [PATCH] Fix customize HTML/CSS only show desktop code custom_top and custom_footer method in SiteCustomization is setting :desktop as default argument for `target` It output the desktop version of the custom_top, custom_footer even user in mobile_view. This fix is adding the missing target into method argument. --- app/controllers/application_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3a94fe59bdf..fe60409f75b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -284,9 +284,10 @@ class ApplicationController < ActionController::Base end def custom_html_json + target = view_context.mobile_view? ? :mobile : :desktop data = { - top: SiteCustomization.custom_top(session[:preview_style]), - footer: SiteCustomization.custom_footer(session[:preview_style]) + top: SiteCustomization.custom_top(session[:preview_style], target), + footer: SiteCustomization.custom_footer(session[:preview_style], target) } if DiscoursePluginRegistry.custom_html