From c489d67d1a6540c2f80c2beee8d435b170e93a75 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake@blake.local>
Date: Mon, 15 Oct 2007 13:56:39 -0700
Subject: [PATCH] require users vendor directory on load

---
 CHANGELOG      | 1 +
 Manifest       | 2 +-
 lib/sinatra.rb | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 251d50b..f97564b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,3 @@
+v0.1.6 Additions:  require users vendor directory on load
 v0.1.5 Mutex and before-filters
 v0.1.0 Released!
diff --git a/Manifest b/Manifest
index 8b04bcd..9e194c4 100644
--- a/Manifest
+++ b/Manifest
@@ -30,6 +30,7 @@ lib/sinatra/sessions.rb
 lib/sinatra/test_methods.rb
 lib/sinatra.rb
 LICENSE
+Manifest
 RakeFile
 README
 sinatra.gemspec
@@ -50,4 +51,3 @@ vendor/erb/lib/erb.rb
 vendor/haml/init.rb
 vendor/haml/lib/haml.rb
 Rakefile
-Manifest
diff --git a/lib/sinatra.rb b/lib/sinatra.rb
index 6a7d537..8aae810 100644
--- a/lib/sinatra.rb
+++ b/lib/sinatra.rb
@@ -38,6 +38,8 @@ Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/rack_ext/*.rb')
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/lib/sinatra/*.rb')
 Sinatra::Loader.load_files Dir.glob(SINATRA_ROOT + '/vendor/*/init.rb')
 
+Sinatra::Loader.load_files Dir.glob(File.dirname($0) + '/vendor/*/init.rb')
+
 Sinatra::Environment.prepare
 
 at_exit do
-- 
2.11.4.GIT