aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-11-11 16:06:23 +0000
committerLouise Crow <louise.crow@gmail.com>2013-11-12 14:57:44 +0000
commit89ee3ff54eba0c23bbe1ce6deb40092185fdfb01 (patch)
tree3c93b56d8f1d4123d37d4efd22fb1e9d276e75dc
parentd98732783b14869aca818d0c204bfb6e67b268d7 (diff)
Highlighter is now an option.
Passing it as an argument is deprecated.
-rw-r--r--app/helpers/application_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e3b1e57ac..99322c65f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -54,9 +54,9 @@ module ApplicationHelper
# Highlight words, also escapes HTML (other than spans that we add)
def highlight_words(t, words, html = true)
if html
- highlight(h(t), words, '<span class="highlight">\1</span>').html_safe
+ highlight(h(t), words, :highlighter => '<span class="highlight">\1</span>').html_safe
else
- highlight(t, words, '*\1*')
+ highlight(t, words, :highlighter => '*\1*')
end
end