Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit 4a569d979c0e · 2014-06-05T09:09:33.000+02:00
Master
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -498,6 +498,13 @@ 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, INSERT, DELETE ON ".$value['db'].".`mail_backup` TO '".$value['user']."'@'".$host."' ";
+				if ($verbose){
+					echo $query ."\n";
+				}
+				if(!$this->dbmaster->query($query)) {
+					$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);
+				}
 			}
 
 			/*

Original file line number	Diff line number	Diff line change
`@@ -498,6 +498,13 @@ public function grant_master_database_rights($verbose = false) {`
`498`	`498`	`$this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);`
`499`	`499`	`}`
`500`	`500`
	`501`	+ $query = "GRANT SELECT, INSERT, DELETE ON ".$value['db'].".`mail_backup` TO '".$value['user']."'@'".$host."' ";
	`502`	`+ if ($verbose){`
	`503`	`+ echo $query ."\n";`
	`504`	`+ }`
	`505`	`+ if(!$this->dbmaster->query($query)) {`
	`506`	`+ $this->warning('Unable to set rights of user in master database: '.$value['db']."\n Query: ".$query."\n Error: ".$this->dbmaster->errorMessage);`
	`507`	`+ }`
`501`	`508`	`}`
`502`	`509`
`503`	`510`	`/*`