From 513331d114b4ad683e85c0158f7f596cad315cb5 Mon Sep 17 00:00:00 2001
From: Nihad Abbasov <narkoz.2008@gmail.com>
Date: Mon, 24 Dec 2012 20:56:32 +0400
Subject: fetch highlighter option only when needed

---
 actionpack/lib/action_view/helpers/text_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 26d2142df9..2e124cf085 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -112,12 +112,12 @@ module ActionView
       #   highlight('You searched for: rails', 'rails', highlighter: '<a href="search?q=\1">\1</a>')
       #   # => You searched for: <a href="search?q=rails">rails</a>
       def highlight(text, phrases, options = {})
-        highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
-
         text = sanitize(text) if options.fetch(:sanitize, true)
+
         if text.blank? || phrases.blank?
           text
         else
+          highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
           text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
         end.html_safe
-- 
cgit v1.2.3