Merge pull request #17517 from aidvu/patch-2

Revert to old behavior for `ShowServerInfo`
phpmyadmin · Jun 6, 2022 · fcea0f3 · fcea0f3
2 parents be73574 + c6bb867
commit fcea0f3
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php
@@ -143,20 +143,16 @@ public function __invoke(): void
         }
 
         $databaseServer = [];
-        if ($server > 0) {
+        if ($server > 0 && $cfg['ShowServerInfo']) {
             $hostInfo = '';
             if (! empty($cfg['Server']['verbose'])) {
                 $hostInfo .= $cfg['Server']['verbose'];
-                if ($cfg['ShowServerInfo']) {
-                    $hostInfo .= ' (';
-                }
+                $hostInfo .= ' (';
             }
 
-            if ($cfg['ShowServerInfo'] || empty($cfg['Server']['verbose'])) {
-                $hostInfo .= $this->dbi->getHostInfo();
-            }
+            $hostInfo .= $this->dbi->getHostInfo();
 
-            if (! empty($cfg['Server']['verbose']) && $cfg['ShowServerInfo']) {
+            if (! empty($cfg['Server']['verbose'])) {
                 $hostInfo .= ')';
             }