From d792bc68a2e274c7b19ae425b19c2989d8fd35f8 Mon Sep 17 00:00:00 2001
From: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
Date: Sat, 30 Mar 2019 18:58:39 +0530
Subject: [PATCH] Fix #15119 - Uninterpreted HTML on Settings->Export page

Signed-off-by: Saurabh Srivastava <saurabhsrivastava312@gmail.com>
---
 libraries/classes/Config/Descriptions.php        | 2 +-
 libraries/classes/Config/FormDisplayTemplate.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
index c86a3ebace..37fc5c2258 100644
--- a/libraries/classes/Config/Descriptions.php
+++ b/libraries/classes/Config/Descriptions.php
@@ -248,7 +248,7 @@ class Descriptions
                 return __('Maximum execution time');
             case 'Export_lock_tables_name':
                 return sprintf(
-                    __('Use %s statement'), '<code>LOCK TABLES</code>'
+                    __('Use %s statement'), htmlspecialchars('<code>LOCK TABLES</code>')
                 );
             case 'Export_asfile_name':
                 return __('Save as file');
diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php
index d77fc1819e..88dee0c78b 100644
--- a/libraries/classes/Config/FormDisplayTemplate.php
+++ b/libraries/classes/Config/FormDisplayTemplate.php
@@ -216,7 +216,7 @@ class FormDisplayTemplate
 
         $htmlOutput = '<tr' . $tr_class . '>';
         $htmlOutput .= '<th>';
-        $htmlOutput .= '<label for="' . htmlspecialchars($path) . '">' . $name
+        $htmlOutput .= '<label for="' . htmlspecialchars($path) . '">' . htmlspecialchars_decode($name)
             . '</label>';
 
         if (! empty($opts['doc'])) {