diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-15 05:34:59 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-15 05:34:59 +0000 |
| commit | 5dbf5ded5c5978b8ee87044c34c3e6ca6fc381a1 (patch) | |
| tree | 6f07620216e8f0f35945dde8210f7a944ee3d328 /actionpack | |
| parent | e9504bb6f785a3e38788c9d787eef07d464fdd0c (diff) | |
| download | rails-5dbf5ded5c5978b8ee87044c34c3e6ca6fc381a1.tar.gz rails-5dbf5ded5c5978b8ee87044c34c3e6ca6fc381a1.tar.bz2 rails-5dbf5ded5c5978b8ee87044c34c3e6ca6fc381a1.zip | |
Only attempt to require Active Support if it hasnt been already #1959
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2247 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index cdc9102062..d9762973d8 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -21,14 +21,17 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.dirname(__FILE__)) -$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") +$:.unshift(File.dirname(__FILE__)) unless + $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) -begin - require 'active_support' -rescue LoadError - require 'rubygems' - require_gem 'activesupport' +unless defined?(ActiveSupport) + begin + $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") + require 'active_support' + rescue LoadError + require 'rubygems' + require_gem 'activesupport' + end end require 'action_controller/base' |