cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add rinku to get auto_link support back

Browse source
This commit is contained in:
Tom Hughes 2011-09-25 11:51:17 +01:00
parent 416e4c91c8
commit 3377879d39
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -15,6 +15,7 @@ gem 'rails-i18n-updater'
gem 'validates_email_format_of', '>= 1.5.1' gem 'validates_email_format_of', '>= 1.5.1'
gem 'open_id_authentication', '>= 1.1.0' gem 'open_id_authentication', '>= 1.1.0'
gem 'prototype-rails' gem 'prototype-rails'
gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
# Should only load if memcache is in use # Should only load if memcache is in use
#gem 'memcached' #gem 'memcached'

2
Gemfile.lock
View file

@ -111,6 +111,7 @@ GEM
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2)
rdoc (3.9.4) rdoc (3.9.4)
rinku (1.2.2)
rmagick (2.13.1) rmagick (2.13.1)
ruby-openid (2.1.8) ruby-openid (2.1.8)
sanitize (2.0.3) sanitize (2.0.3)
@ -153,6 +154,7 @@ DEPENDENCIES
prototype-rails prototype-rails
rails (= 3.1.0) rails (= 3.1.0)
rails-i18n-updater rails-i18n-updater
rinku (>= 1.2.2)
rmagick rmagick
sanitize sanitize
sass-rails (~> 3.1.0) sass-rails (~> 3.1.0)

2
app/helpers/application_helper.rb
View file

@ -10,7 +10,7 @@ module ApplicationHelper
end end
def linkify(text) def linkify(text)
return auto_link(text, :link => :urls, :html => { :rel => "nofollow" }) return Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
end end
def html_escape_unicode(text) def html_escape_unicode(text)