Download as
Browse Code »

Commit 3ce06577b3b34b0e7973c33576cbeae560c62592

Authored by Braulio Bhavamitra
1 parent 1e78417c
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: fix layout disable

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @3ce0657
@@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base @@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base
41 include ApplicationHelper 41 include ApplicationHelper
42 layout :get_layout 42 layout :get_layout
43 def get_layout 43 def get_layout
44 - return nil if request.format == :js or request.xhr? 44 + return false if request.format == :js or request.xhr?
45 45
46 theme_layout = theme_option(:layout) 46 theme_layout = theme_option(:layout)
47 if theme_layout 47 if theme_layout