Simplify $sockets testing logic

Évan Goujon · cerebro-alexiel · commit 7af014ffdfdd · 2018-08-31T21:51:56.000+02:00
Signed-off-by: Évan Goujon &lt;evan.goujon@gmail.com&gt;
diff --git a/etc/phpmyadmin/config.inc.php b/etc/phpmyadmin/config.inc.php
@@ -118,10 +118,8 @@
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
 for ($i = 1; isset($sockets[$i - 1]); $i++) {
-    if (isset($sockets[$i - 1])) {
-        $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
-        $cfg['Servers'][$i]['host'] = 'localhost';
-    }
+    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
+    $cfg['Servers'][$i]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,8 @@`
`118`	`118`	`$cfg['Servers'][$i]['AllowNoPassword'] = true;`
`119`	`119`	`}`
`120`	`120`	`for ($i = 1; isset($sockets[$i - 1]); $i++) {`
`121`		`- if (isset($sockets[$i - 1])) {`
`122`		`- $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];`
`123`		`- $cfg['Servers'][$i]['host'] = 'localhost';`
`124`		`- }`
	`121`	`+ $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];`
	`122`	`+ $cfg['Servers'][$i]['host'] = 'localhost';`
`125`	`123`	`}`
`126`	`124`	`/*`
`127`	`125`	`* Revert back to last configured server to make`