Download as
Browse Code »

Commit 55649101371763227616e76dba1bf6083ac9a9f1

Authored by Rodrigo Souto
1 parent 87318d7b
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-controller: uncomment protected scope

Showing 1 changed file with 2 additions and 2 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @5564910
@@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base @@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base
79 79
80 helper_method :current_person, :current_person 80 helper_method :current_person, :current_person
81 81
82 - # protected 82 + protected
83 83
84 def setup_multitenancy 84 def setup_multitenancy
85 Noosfero::MultiTenancy.setup!(request.host) 85 Noosfero::MultiTenancy.setup!(request.host)
@@ -174,7 +174,7 @@ class ApplicationController < ActionController::Base @@ -174,7 +174,7 @@ class ApplicationController < ActionController::Base
174 end 174 end
175 175
176 def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={}) 176 def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
177 - @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) || 177 + plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
178 fallback_find_by_contents(asset, scope, query, paginate_options, options) 178 fallback_find_by_contents(asset, scope, query, paginate_options, options)
179 end 179 end
180 180