Download as
Browse Code »

Commit 36b244456d253f7c41cfd093a3ae19080f91c43b

Authored by Antonio Terceiro
1 parent 8924daed
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

Fix inclusion of theme files

Showing 1 changed file with 7 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @36b2444
@@ -387,10 +387,14 @@ module ApplicationHelper @@ -387,10 +387,14 @@ module ApplicationHelper
387 end 387 end
388 388
389 def theme_include(template) 389 def theme_include(template)
390 - file = (Rails.root + '/public' + theme_path + '/' + template + '.html.erb')  
391 - if File.exists?(file)  
392 - return render :file => file, :use_full_path => false 390 + # XXX Since we cannot control what people are doing in external themes, we
  391 + # will keep looking for the deprecated .rhtml extension here.
  392 + ['.rhtml', '.html.erb'].each do |ext|
  393 + file = File.join(Rails.root, 'public', theme_path, template + ext)
  394 + if File.exists?(file)
  395 + return render :file => file, :use_full_path => false
393 end 396 end
  397 + end
394 nil 398 nil
395 end 399 end
396 400