Merge branch 'stable-3.1' into 'stable-3.1'

Till Brehm · Till Brehm · commit 60acf2ea7196 · 2016-08-19T15:14:42.000+02:00
Hide Databases menu if no db-server is defined #4128



See merge request !421
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
@@ -64,7 +64,7 @@
 }
 
 // Databases menu
-if($app->auth->get_client_limit($userid, 'database') != 0)
+if($app->auth->get_client_limit($userid, 'database') != 0 && $app->system->has_service($userid, 'db'))
 {
 	$items=array();
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Databases menu`
`67`		`-if($app->auth->get_client_limit($userid, 'database') != 0)`
	`67`	`+if($app->auth->get_client_limit($userid, 'database') != 0 && $app->system->has_service($userid, 'db'))`
`68`	`68`	`{`
`69`	`69`	`$items=array();`
`70`	`70`