deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

only require padrino once

Browse source
This commit is contained in:
Thomas Reynolds 2013-06-04 09:48:01 -07:00
parent c741735446
commit a9839731e6
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
middleman-core/lib/middleman-core/meta_pages/sitemap_resource.rb
View file

@ -1,5 +1,7 @@
if defined?(::Padrino::Helpers)
require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' 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' require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers'
end
module Middleman module Middleman
module MetaPages module MetaPages

3
middleman-core/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -4,8 +4,11 @@ class Middleman::CoreExtensions::DefaultHelpers < ::Middleman::Extension
super super
require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/object/to_query'
if defined?(::Padrino::Helpers)
require 'vendored-middleman-deps/padrino-core-0.10.7/lib/padrino-core/support_lite' 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' require 'vendored-middleman-deps/padrino-helpers-0.10.7/lib/padrino-helpers'
end
app.helpers ::Padrino::Helpers::OutputHelpers app.helpers ::Padrino::Helpers::OutputHelpers
app.helpers ::Padrino::Helpers::TagHelpers app.helpers ::Padrino::Helpers::TagHelpers