diff --git a/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb b/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb index 24112d99..85a9b2c0 100644 --- a/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb +++ b/middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb @@ -1,5 +1,7 @@ -require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' -require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers' +if defined?(::Padrino::Helpers) + require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' + require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers' +end module Middleman module MetaPages diff --git a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb index f9069f68..670aa831 100644 --- a/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb +++ b/middleman-core/lib/middleman-more/core_extensions/default_helpers.rb @@ -4,8 +4,11 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension super require 'active_support/core_ext/object/to_query' - require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' - require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers' + + if defined?(::Padrino::Helpers) + require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' + require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers' + end app.helpers ::Padrino::Helpers::OutputHelpers app.helpers ::Padrino::Helpers::TagHelpers