Merge branch 'vhost_sql_fix' into 'master'

Marius Cramer · Marius Cramer · commit 8a4a1faf936b · 2014-07-23T09:29:53.000+02:00
Vhost sql fix

Fix for changing tab on site web, when logged as admin.
diff --git a/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php b/interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php
@@ -85,7 +85,7 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {
 				$client_id = $app->functions->intval($client["client_id"]);
 			}
 
-			$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $client_group_id");
+			$tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = ?", $client_group_id);
 			$client_user_id = $app->functions->intval(($tmp['userid'] > 0)?$tmp['userid']:1);
 
 			// Set the values for document_root, system_user and system_group

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function sites_web_vhost_domain_edit($event_name, $page_form) {`
`85`	`85`	`$client_id = $app->functions->intval($client["client_id"]);`
`86`	`86`	`}`
`87`	`87`
`88`		`- $tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = $client_group_id");`
	`88`	`+ $tmp = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE default_group = ?", $client_group_id);`
`89`	`89`	`$client_user_id = $app->functions->intval(($tmp['userid'] > 0)?$tmp['userid']:1);`
`90`	`90`
`91`	`91`	`// Set the values for document_root, system_user and system_group`