Merge remote-tracking branch 'security/security/279' into QA_4_9

phpmyadmin · Sep 20, 2019 · 0de99c8 · 0de99c8
2 parents 988e644 + 6e1bbc5
commit 0de99c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@@ -86,7 +86,7 @@ public function indexAction()
         $scripts->addFile('server_databases.js');
 
         $this->_setSortDetails();
-        $this->_dbstats = empty($_REQUEST['dbstats']) ? false : true;
+        $this->_dbstats = ! empty($_POST['dbstats']);
         $this->_pos     = empty($_REQUEST['pos']) ? 0 : (int) $_REQUEST['pos'];
 
         /**

diff --git a/templates/server/databases/databases_footer.twig b/templates/server/databases/databases_footer.twig
@@ -63,19 +63,13 @@
 {# Enable statistics #}
 {% if dbstats is empty %}
     {{ Message_notice('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'|trans) }}
-
-    {% set content %}
-        <strong>{% trans 'Enable statistics' %}</strong>
-    {% endset %}
-    {% set items = [{
-        'content': content,
-        'class': 'li_switch_dbstats',
-        'url': {
-            'href': 'server_databases.php' ~ Url_getCommon({'dbstats': '1'}),
-            'title': 'Enable statistics'|trans
-        }
-    }] %}
-    {% include 'list/unordered.twig' with {'items': items} only %}
+    <ul>
+        <li class="li_switch_dbstats">
+            <a href="server_databases.php" data-post="{{ Url_getCommon({'dbstats': '1'}, '') }}" title="{% trans 'Enable statistics' %}">
+                <strong>{% trans 'Enable statistics' %}</strong>
+            </a>
+        </li>
+    </ul>
 {% endif %}
 </form>
 </div>