From 921e7852c81a1409d6148b3541af5dbe69e12439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Thu, 21 Sep 2017 17:55:05 -0300
Subject: [PATCH] Port server/variables/variable_row to Twig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 templates/server/variables/variable_row.phtml | 30 -------------------
 templates/server/variables/variable_row.twig  | 29 ++++++++++++++++++
 2 files changed, 29 insertions(+), 30 deletions(-)
 delete mode 100644 templates/server/variables/variable_row.phtml
 create mode 100644 templates/server/variables/variable_row.twig

diff --git a/templates/server/variables/variable_row.phtml b/templates/server/variables/variable_row.phtml
deleted file mode 100644
index 9b158a7ca3..0000000000
--- a/templates/server/variables/variable_row.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<tr class="var-row <?= $rowClass; ?>">
-    <td class="var-action">
-    <?php if ($editable): ?>
-        <a href="#" data-variable="<?= htmlspecialchars($name) ?>" class="editLink"><?= \PhpMyAdmin\Util::getIcon('b_edit.png', __('Edit')) ?></a>
-    <?php else: ?>
-        <span title="<?= __('This is a read-only variable and can not be edited') ?>" class="read_only_var">
-            <?= \PhpMyAdmin\Util::getIcon('bd_edit.png', __('Edit')) ?>
-        </span>
-    <?php endif; ?>
-    </td>
-    <td class="var-name">
-    <?php if ($docLink != null): ?>
-        <span title="<?= htmlspecialchars(str_replace('_', ' ', $name)); ?>">
-            <?= \PhpMyAdmin\Util::showMySQLDocu($docLink[1], false, $docLink[2] . '_' . $docLink[0], true)
-                , str_replace('_', '&nbsp;', htmlspecialchars($name))
-                , '</a>'
-            ?>
-        </span>
-    <?php else: ?>
-        <?= htmlspecialchars(str_replace('_', ' ', $name)); ?>
-    <?php endif; ?>
-    </td>
-    <td class="var-value value <?= ($isSuperuser ? ' editable' : '') ?>">
-    <?php if ($isHtmlFormatted == false): ?>
-        <?= str_replace(',', ',&#8203;', htmlspecialchars($value)); ?>
-    <?php else: ?>
-        <?= $value; ?>
-    <?php endif; ?>
-    </td>
-</tr>
diff --git a/templates/server/variables/variable_row.twig b/templates/server/variables/variable_row.twig
new file mode 100644
index 0000000000..710f5d0eef
--- /dev/null
+++ b/templates/server/variables/variable_row.twig
@@ -0,0 +1,29 @@
+<tr class="var-row {{ row_class }}">
+    <td class="var-action">
+    {% if editable %}
+        <a href="#" data-variable="{{ name }}" class="editLink">{{ Util_getIcon('b_edit.png', 'Edit'|trans) }}</a>
+    {% else %}
+        <span title="{% trans 'This is a read-only variable and can not be edited' %}" class="read_only_var">
+            {{ Util_getIcon('bd_edit.png', 'Edit'|trans) }}
+        </span>
+    {% endif %}
+    </td>
+    <td class="var-name">
+    {% if doc_link != null %}
+        <span title="{{ name|replace({'_': ' '}) }}">
+            {{ Util_showMySQLDocu(doc_link[1], false, doc_link[2] ~ '_' ~ doc_link[0], true) }}
+            {{ name|e|replace({'_': '&nbsp;'})|raw }}
+            </a>
+        </span>
+    {% else %}
+        {{ name|replace({'_': ' '}) }}
+    {% endif %}
+    </td>
+    <td class="var-value value{{ is_superuser ? ' editable' }}">
+    {% if is_html_formatted == false %}
+        {{ value|e|replace({',': ',&#8203;'})|raw }}
+    {% else %}
+        {{ value }}
+    {% endif %}
+    </td>
+</tr>