Commit 3ce06577b3b34b0e7973c33576cbeae560c62592
1 parent
1e78417c
Exists in
master
and in
20 other branches
rails4: fix layout disable
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/controllers/application_controller.rb
... | ... | @@ -41,7 +41,7 @@ class ApplicationController < ActionController::Base |
41 | 41 | include ApplicationHelper |
42 | 42 | layout :get_layout |
43 | 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 | 46 | theme_layout = theme_option(:layout) |
47 | 47 | if theme_layout | ... | ... |