From 94c796968ae9a448aa89f363f055ca4a2958ab10 Mon Sep 17 00:00:00 2001 From: Alexandre Rafalovitch Date: Sun, 6 Nov 2016 14:09:55 +1100 Subject: [PATCH] SOLR-9624: Do not highlight CSV output --- solr/CHANGES.txt | 2 ++ solr/webapp/web/js/angular/app.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index e13d3cb00cc..1109ef781b4 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -120,6 +120,8 @@ Bug Fixes * SOLR-9716: RecoveryStrategy sends prep recovery command without setting read time out which can cause replica recovery to hang indefinitely on network partitions. (Cao Manh Dat, shalin) +* SOLR-9624: In Admin UI, do not attempt to highlight CSV output (Alexandre Rafalovitch) + Other Changes ---------------------- diff --git a/solr/webapp/web/js/angular/app.js b/solr/webapp/web/js/angular/app.js index e7491fe63d4..e86b55feee0 100644 --- a/solr/webapp/web/js/angular/app.js +++ b/solr/webapp/web/js/angular/app.js @@ -148,7 +148,7 @@ solrAdminApp.config([ }) .filter('highlight', function($sce) { return function(input, lang) { - if (lang && input && lang!="txt") return hljs.highlight(lang, input).value; + if (lang && input && lang!="txt" && lang!="csv") return hljs.highlight(lang, input).value; return input; } })