Fix for Bug 3589, OpacHighlightedWords sys pref does nothing

diff --git a/C4/Auth.pm b/C4/Auth.pm
index e1f5b9a..33dd36c 100755 (executable)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -397,6 +397,7 @@ sub get_template_and_user {
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
             OPACAmazonReviews         => C4::Context->preference("OPACAmazonReviews"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
+            OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
             OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
             OPACShelfBrowser          => "". C4::Context->preference("OPACShelfBrowser"),
             OPACURLOpenInNewWindow    => "" . C4::Context->preference("OPACURLOpenInNewWindow"),

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 7e93baa..5460268 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -10,8 +10,8 @@
 
 
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
-<script type="text/javascript">
+<!-- TMPL_IF NAME="OpacHighlightedWords" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
+<!-- /TMPL_IF --><script type="text/javascript">
 //<![CDATA[
 
 function holdMultiple() {
@@ -162,13 +162,11 @@ $(document).ready(function(){
 <!-- /TMPL_IF -->
     $("#holdDetails").hide();
 
-    <!-- TMPL_IF NAME="query_desc" -->
-        var query_desc = "<!-- TMPL_VAR NAME="query_desc" ESCAPE="JS"-->";
+<!-- TMPL_IF NAME="query_desc" --><!-- TMPL_IF NAME="OpacHighlightedWords" -->var query_desc = "<!-- TMPL_VAR NAME="query_desc" ESCAPE="JS"-->";
         q_array = query_desc.split(" ");
         highlightOn();
         $("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});
-        $("#highlight_toggle_off").show().click(function() {highlightOff();});
-    <!-- /TMPL_IF -->
+        $("#highlight_toggle_off").show().click(function() {highlightOff();});<!-- /TMPL_IF --><!-- /TMPL_IF -->
 
        <!-- TMPL_IF NAME="TagsEnabled" -->
         $(".tagbutton").click(KOHA.Tags.add_tag_button);