Download as
Browse Code »

Commit adc8efa4890de31de7acbca5f46ed022c80f4a25

Authored by Antonio Terceiro
2 parents 098a2def 3951277f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, 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, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'ai3299' into 'master' 

Fix support of custom layout in themes

http://noosfero.org/Development/ActionItem3299

See merge request !315
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @adc8efa
... ... @@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base
40 40  
41 41 theme_layout = theme_option(:layout)
42 42 if theme_layout
43   - theme_view_file('layouts/'+theme_layout) || theme_layout
  43 + (theme_view_file('layouts/'+theme_layout) || theme_layout).to_s
44 44 else
45 45 'application'
46 46 end
... ...