Download as
Browse Code »

Commit b176a864627bb5b30790653fa311f05931f462d2

Authored by Daniela Feitosa
1 parent 7d22740a
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

updating application controller to support layouts from themes

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