Add rinku to get auto_link support back

diff --git a/Gemfile b/Gemfile
index a6df39774ed5da6895f9e8c9fe422952445b6d27..e8a92ccad300f0bda2bf8b19235dc852683d6ef9 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ gem 'rails-i18n-updater'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'prototype-rails'
+gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 
 # Should only load if memcache is in use
 #gem 'memcached'

diff --git a/Gemfile.lock b/Gemfile.lock
index 99087080f2588a9302ba82efa2d813f4ce85adb7..b77f65cf5aba5a6fd4e72db971905cb78e77aaee 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -111,6 +111,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
+    rinku (1.2.2)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
@@ -153,6 +154,7 @@ DEPENDENCIES
   prototype-rails
   rails (= 3.1.0)
   rails-i18n-updater
+  rinku (>= 1.2.2)
   rmagick
   sanitize
   sass-rails (~> 3.1.0)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 34f9a893cdbec9e7aacd574a83353f176219f488..8073c2583d0f88b5f0d258f85e5b1448e11e8683 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,7 +10,7 @@ module ApplicationHelper
   end
 
   def linkify(text)
-    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
+    return Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
   end
 
   def html_escape_unicode(text)