Move back compress and AllowNoPassword to default configuration

soullivaneuh · nijel · commit 7a5f742d7d5c · 2018-05-17T16:09:14.000+02:00
diff --git a/etc/phpmyadmin/config.inc.php b/etc/phpmyadmin/config.inc.php
@@ -94,8 +94,6 @@
       $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
       $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
       $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-      $cfg['Servers'][$i]['compress'] = false;
-      $cfg['Servers'][$i]['AllowNoPassword'] = true;
     }
     if (isset($_ENV['PMA_CONTROLHOST'])) {
       $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
@@ -109,6 +107,8 @@
     if (isset($_ENV['PMA_CONTROLPASS'])) {
       $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
     }
+    $cfg['Servers'][$i]['compress'] = false;
+    $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
 /*
  * Revert back to last configured server to make

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@`
`94`	`94`	`$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';`
`95`	`95`	`$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';`
`96`	`96`	`$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';`
`97`		`- $cfg['Servers'][$i]['compress'] = false;`
`98`		`- $cfg['Servers'][$i]['AllowNoPassword'] = true;`
`99`	`97`	`}`
`100`	`98`	`if (isset($_ENV['PMA_CONTROLHOST'])) {`
`101`	`99`	`$cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];`
`@@ -109,6 +107,8 @@`
`109`	`107`	`if (isset($_ENV['PMA_CONTROLPASS'])) {`
`110`	`108`	`$cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];`
`111`	`109`	`}`
	`110`	`+ $cfg['Servers'][$i]['compress'] = false;`
	`111`	`+ $cfg['Servers'][$i]['AllowNoPassword'] = true;`
`112`	`112`	`}`
`113`	`113`	`/*`
`114`	`114`	`* Revert back to last configured server to make`