Merge branch 'QA_5_1'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

ChangeLog

@@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
 - issue #16982 Do not try to delete internal relations if they are not configured
 - issue #16982 Show success messages on Designer for add and remove relation operations
 - issue        Fixed possible "Undefined index: clause_is_unique" on replace value in cell
+- issue #16991 Fixed case where $_SERVER['REQUEST_METHOD'] is undefined
 
 5.1.1 (2021-06-04)
 - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa

libraries/classes/Controllers/LogoutController.php

@@ -12,7 +12,7 @@ class LogoutController
     {
         global $auth_plugin, $token_mismatch;
 
-        if ($_SERVER['REQUEST_METHOD'] !== 'POST' || $token_mismatch) {
+        if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'POST' || $token_mismatch) {
             Core::sendHeaderLocation('./index.php?route=/');
 
             return;

libraries/classes/Core.php

@@ -1393,7 +1393,7 @@ class Core
         $token_mismatch = true;
         $token_provided = false;
 
-        if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+        if (($_SERVER['REQUEST_METHOD'] ?? 'GET') !== 'POST') {
             return;
         }
 

setup/index.php

@@ -56,7 +56,7 @@ if ($page === 'config') {
 
 if ($page === 'servers') {
     $controller = new ServersController($GLOBALS['ConfigFile'], new Template());
-    if (isset($_GET['mode']) && $_GET['mode'] === 'remove' && $_SERVER['REQUEST_METHOD'] === 'POST') {
+    if (isset($_GET['mode']) && $_GET['mode'] === 'remove' && ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST') {
         $controller->destroy([
             'id' => $_GET['id'] ?? null,
         ]);