Merge pull request hestiacp#1395 from ioannidesalex/patch-13

serghey-rodin · web-flow · commit c3872c26ee7e · 2017-12-29T00:26:49.000+02:00
Fix
diff --git a/install/ubuntu/16.04/pma/config.inc.php b/install/ubuntu/16.04/pma/config.inc.php
@@ -17,6 +17,7 @@
  * (also on the filesystem level).
  */
 
+if (!function_exists('check_file_access')) {
 function check_file_access($path)
 {
     if (is_readable($path)) {
@@ -29,6 +30,7 @@ function check_file_access($path)
         return false;
     }
 }
+}
 
 // Load secret generated on postinst
 if (check_file_access('/var/lib/phpmyadmin/blowfish_secret.inc.php')) {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* (also on the filesystem level).`
`18`	`18`	`*/`
`19`	`19`
	`20`	`+if (!function_exists('check_file_access')) {`
`20`	`21`	`function check_file_access($path)`
`21`	`22`	`{`
`22`	`23`	`if (is_readable($path)) {`
`@@ -29,6 +30,7 @@ function check_file_access($path)`
`29`	`30`	`return false;`
`30`	`31`	`}`
`31`	`32`	`}`
	`33`	`+}`
`32`	`34`
`33`	`35`	`// Load secret generated on postinst`
`34`	`36`	`if (check_file_access('/var/lib/phpmyadmin/blowfish_secret.inc.php')) {`