Download as
Browse Code »

Commit 290c4b8ed97cbce2a4b3d96a3b1ba9c9a105e68e

Authored by Rodrigo Souto
1 parent d35bce8d
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

application-helper: allow theme_include to receive options 

(ActionItem2950)
Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @290c4b8
@@ -407,10 +407,11 @@ module ApplicationHelper @@ -407,10 +407,11 @@ module ApplicationHelper
407 nil 407 nil
408 end 408 end
409 409
410 - def theme_include(template) 410 + def theme_include(template, options = {})
411 file = theme_view_file(template) 411 file = theme_view_file(template)
  412 + options.merge!({:file => file, :use_full_path => false})
412 if file 413 if file
413 - render :file => file, :use_full_path => false 414 + render options
414 else 415 else
415 nil 416 nil
416 end 417 end