Merge branch 'fix-4231-4240' into 'stable-3.1'

Till Brehm · Till Brehm · commit 2e998b93e23f · 2016-10-03T09:20:57.000+02:00
Fixes wrong query errors (fixes #4231, #4240)



See merge request !459
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -585,7 +585,7 @@ public function grant_master_database_rights($verbose = false) {
 					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
 				}
 
-				$query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
+				$query = "GRANT SELECT, UPDATE (`ssl`, `ssl_letsencrypt`, `ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
 				if ($verbose){
 					echo $query ."\n";
 				}

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ public function grant_master_database_rights($verbose = false) {`
`585`	`585`	`$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);`
`586`	`586`	`}`
`587`	`587`
`588`		- $query = "GRANT SELECT, UPDATE (`ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
	`588`	+ $query = "GRANT SELECT, UPDATE (`ssl`, `ssl_letsencrypt`, `ssl_request`, `ssl_cert`, `ssl_action`, `ssl_key`) ON ?? TO ?@?";
`589`	`589`	`if ($verbose){`
`590`	`590`	`echo $query ."\n";`
`591`	`591`	`}`