Merge branch 'issues/1434-email-highlighting' into rails-3-develop

1 files changed, 9 insertions, 1 deletions

diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index c15fb573d..83700a55b 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -154,7 +154,15 @@ class TrackController < ApplicationController
         request.format = 'xml' unless params[:format]
         respond_to do |format|
             format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true,
-                    lambda { |t| view_context.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) }
+                    lambda do |t|
+                        view_context.highlight_and_excerpt(
+                            t,
+                            @xapian_object.words_to_highlight(
+                                :regex => true,
+                                :include_original => true),
+                            150
+                        )
+                    end
                 ) } }
             format.any { render :template => 'track/atom_feed',
                                 :formats => ['atom'],