Merge pull request #2886 from vincent99/release-2.5.8

DetailText escape
rancher · May 3, 2021 · 6ddcdbc · 6ddcdbc
2 parents 695c26d + c510331
commit 6ddcdbc
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/components/DetailText.vue b/components/DetailText.vue
@@ -107,6 +107,7 @@ export default {
     },
 
     bodyHtml() {
+      // Includes escapeHtml()
       return nlToBr(this.body);
     },
 
@@ -155,7 +156,7 @@ export default {
       :class="{'conceal': concealed}"
     />
 
-    <span v-else :class="{'conceal': concealed, 'monospace': monospace && !isBinary}" v-html="monospace ? body : bodyHtml" />
+    <span v-else :class="{'conceal': concealed, 'monospace': monospace && !isBinary}" v-html="bodyHtml" />
 
     <template v-if="!isBinary && !jsonStr && isLong && !expanded">
       <a href="#" @click.prevent="expand">{{ plusMore }}</a>