Download as
Browse Code »

Commit e60922134d3e48479ebeceed6912a05d85e27a27

Authored by Daniela Feitosa
Committed by Valessio Brito
1 parent c008814f
Exists in master and in 8 other branches cherry-pick-62193d8b, federation, gemfile-changes, rails4, rails5, stable-1.2, stable-1.3, stable-1.5

updating application controller to support layouts from themes

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @e609221
@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base @@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
5 include ApplicationHelper 5 include ApplicationHelper
6 layout :get_layout 6 layout :get_layout
7 def get_layout 7 def get_layout
  8 + prepend_view_path('public/' + theme_path)
8 theme_option(:layout) || 'application' 9 theme_option(:layout) || 'application'
9 end 10 end
10 11