Follow up for Bug 3326: previous fix broke searches when

This fix ensures that searches will still work when -x is not used when
reindexing Zebra.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Magnus Enger <magnus@bibkat.no>
Signed-off-by: Jane Wagner <jwagner@ptfs.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e18ddca9d4a6c741a918be28bb3e2cc3e2b30030)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>

diff --git a/C4/XSLT.pm b/C4/XSLT.pm
index e63ecaf..cc442b9 100644 (file)
--- a/C4/XSLT.pm
+++ b/C4/XSLT.pm
@@ -139,7 +139,7 @@ sub XSLTParse4Display {
     $sysxml .= "</sysprefs>\n";
     $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/;
     if ($fixamps) { # We need to correct the ampersand entities that Zebra outputs
-        $xmlrecord =~ s/\&amp;/\&/g;
+        $xmlrecord =~ s/\&amp;amp;/\&amp;/g;
     }
     $xmlrecord =~ s/\& /\&amp\; /;
     $xmlrecord =~ s/\&amp\;amp\; /\&amp\; /;