aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-09-26 17:59:46 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-09-26 17:59:46 +0000
commit9852197f83e19939951e700b51f806477ada2769 (patch)
tree5138179687466e0ba66661c829735f01b6d4885c /actionpack/lib/action_view
parenta68557952fd6caac526769beb699c7936cef001f (diff)
downloadrails-9852197f83e19939951e700b51f806477ada2769.tar.gz
rails-9852197f83e19939951e700b51f806477ada2769.tar.bz2
rails-9852197f83e19939951e700b51f806477ada2769.zip
r3573@asus: jeremy | 2005-09-26 11:38:44 -0700
Ticket 1507 - IE file uploads give the filename as a full Windows path, but Ruby on UNIX doesn't know how to File.basename('C:\\blah\blah.foo'). r3574@asus: jeremy | 2005-09-26 14:32:11 -0700 Get rid of constant redefine warning. r3575@asus: jeremy | 2005-09-26 14:33:07 -0700 Override the file upload's original_filename singleton method in CGIMethods.get_typed_value. r3576@asus: jeremy | 2005-09-26 14:33:49 -0700 Unit test overridden original_filename against normal filenames and full Windows paths. r3577@asus: jeremy | 2005-09-26 14:33:57 -0700 Update change log. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2345 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 8be3d3589c..cafed43aed 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -301,7 +301,7 @@ module ActionView
(?:\#\w*)? # trailing anchor
)
([[:punct:]]|\s|<|$) # trailing text
- /x
+ /x unless const_defined?(:AUTO_LINK_RE)
# Turns all urls into clickable links.
def auto_link_urls(text, href_options = {})