diff --git a/base/lib/refinerycms-base.rb b/base/lib/refinerycms-base.rb index c5a6ba1ad4..be2f5c1a13 100644 --- a/base/lib/refinerycms-base.rb +++ b/base/lib/refinerycms-base.rb @@ -37,28 +37,4 @@ class Engine < ::Rails::Engine end -::Refinery.engines << "base" - -# So that we can "use" the Fiber class' basic functionality. -unless defined?(::Fiber) - class Fiber - - def initialize(&block) - super - @block = block - self - end - - def self.yield(*args) - if args.first.respond_to?(:call) - args.first.call - else - args.first - end - end - - def resume - self.class.yield(@block) - end - end -end +::Refinery.engines << "base" \ No newline at end of file diff --git a/core/app/views/shared/_header.html.erb b/core/app/views/shared/_header.html.erb index 0d3af33585..94c105bb5f 100644 --- a/core/app/views/shared/_header.html.erb +++ b/core/app/views/shared/_header.html.erb @@ -1,15 +1,10 @@

<%= link_to RefinerySetting.find_or_set(:site_name, "Company Name"), root_path %>

-<%= - ::Fiber.new { - ::Fiber.yield( - render(:partial => "/shared/menu", :locals => { - :dom_id => 'menu', - :css => 'menu', - :roots => @menu_pages.where(:parent_id => nil), - :collection => @menu_pages.where(@menu_pages.arel_table[:parent_id].not_eq(nil)), - :selected_item => (@page if defined?(::Page)) - }) - ) - }.resume %> +<%= render(:partial => "/shared/menu", :locals => { + :dom_id => 'menu', + :css => 'menu', + :roots => @menu_pages.where(:parent_id => nil), + :collection => @menu_pages.where(@menu_pages.arel_table[:parent_id].not_eq(nil)), + :selected_item => (@page if defined?(::Page)) + }) -%> \ No newline at end of file