diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 3ee41d385..d9e71acc2 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -45,6 +45,7 @@ - fixed #9039: Synopsis not output as a meta field - fixed #9132: usage error in Hover Help - fixed #4181: hoover help for 'encrypt login' is wrong + - fixed #4186: search results (macro not expanded in the synopsis field) 7.6.3 - improved performance of file uploads diff --git a/lib/WebGUI/Asset/Wobject/Search.pm b/lib/WebGUI/Asset/Wobject/Search.pm index ab0cc806d..d6550e8e5 100644 --- a/lib/WebGUI/Asset/Wobject/Search.pm +++ b/lib/WebGUI/Asset/Wobject/Search.pm @@ -217,8 +217,10 @@ sub view { #Add highlighting $properties->{'title' } = $hl->highlight($properties->{title} || ''); $properties->{'title_nohighlight' } = $properties->{title}; - $properties->{'synopsis' } = $hl->highlight($properties->{synopsis} || ''); - $properties->{'synopsis_nohighlight'} = $properties->{synopsis}; + my $synopsis = $properties->{'synopsis'} || ''; + WebGUI::Macro::process($self->session, \$synopsis); + $properties->{'synopsis' } = $hl->highlight($synopsis); + $properties->{'synopsis_nohighlight'} = $synopsis; push(@results, $properties); $var{results_found} = 1; } diff --git a/lib/WebGUI/i18n/English/Asset_Search.pm b/lib/WebGUI/i18n/English/Asset_Search.pm index e2a3c67bb..cd44cf44e 100644 --- a/lib/WebGUI/i18n/English/Asset_Search.pm +++ b/lib/WebGUI/i18n/English/Asset_Search.pm @@ -130,13 +130,14 @@ our $I18N = { ##hashref of hashes }, 'synopsis' => { - message => q|The synopsis of the Asset found in the search.|, - lastUpdated => 1169843465, + message => q|The synopsis of the Asset found in the search. Macros in the synopsis will be expanded.|, + lastUpdated => 1227292885, }, + 'assetId' => { - message => q|The assetId of the Asset found in the search.|, - lastUpdated => 1169843465, - }, + message => q|The assetId of the Asset found in the search.|, + lastUpdated => 1169843465, + }, 'results_found' => { message => q|A conditional variable that will be true if any results were found.|,