diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
| commit | 0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 (patch) | |
| tree | 74705adf7f9a35c750f74657f0c4a29a6dcce5ff /actionpack/lib/action_view.rb | |
| parent | 4ac332fa9a16ae86b948251e372999b9f4618dec (diff) | |
| download | rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.gz rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.bz2 rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.zip | |
Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view.rb')
| -rw-r--r-- | actionpack/lib/action_view.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 72ef810bd9..db7820ca0b 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -21,7 +21,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.dirname(__FILE__) + "/action_view/vendor") require 'action_view/base' require 'action_view/partials' @@ -29,4 +28,4 @@ ActionView::Base.class_eval do include ActionView::Partials end -ActionView::Base.load_helpers(File.dirname(__FILE__) + "/action_view/helpers/") +ActionView::Base.load_helpers |