Merge branch '6097-error-when-calling-update-php-and-powerdns-is-configured' into 'develop'

Marius Burkard · Marius Burkard · commit f4319390d54f · 2021-03-25T16:24:34.000Z
Resolve "Error when calling update.php and PowerDNS is configured"

Closes #6097

See merge request ispconfig/ispconfig3!1448
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2042,8 +2042,8 @@ public function configure_powerdns() {
 		}
 
 		//* Create the ISPConfig database user in the local database
-		$query = "GRANT ALL ON ?? TO ?@'localhost'";
-		if(!$this->db->query($query, $conf['powerdns']['database'] . '.*', $conf['mysql']['ispconfig_user'])) {
+		$query = "GRANT ALL ON ??.* TO ?@?";
+		if(!$this->db->query($query, $conf['powerdns']['database'], $conf['mysql']['ispconfig_user'], 'localhost')) {
 			$this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -2042,8 +2042,8 @@ public function configure_powerdns() {`
`2042`	`2042`	`}`
`2043`	`2043`
`2044`	`2044`	`//* Create the ISPConfig database user in the local database`
`2045`		`- $query = "GRANT ALL ON ?? TO ?@'localhost'";`
`2046`		`- if(!$this->db->query($query, $conf['powerdns']['database'] . '.*', $conf['mysql']['ispconfig_user'])) {`
	`2045`	`+ $query = "GRANT ALL ON ??.* TO ?@?";`
	`2046`	`+ if(!$this->db->query($query, $conf['powerdns']['database'], $conf['mysql']['ispconfig_user'], 'localhost')) {`
`2047`	`2047`	`$this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage);`
`2048`	`2048`	`}`
`2049`	`2049`