Merge branch 'master' into 'master'

Marius Cramer · Marius Cramer · commit 64604dedaf7f · 2015-11-11T15:07:53.000+01:00
company name for login-page

See merge request !239
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
@@ -312,6 +312,7 @@
 }
 
 $app->load('getconf');
+$sys_config = $app->getconf->get_global_config('misc');
 
 $security_config = $app->getconf->get_security_config('permissions');
 if($security_config['password_reset_allowed'] == 'yes') {

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`$app->load('getconf');`
	`315`	`+$sys_config = $app->getconf->get_global_config('misc');`
`315`	`316`
`316`	`317`	`$security_config = $app->getconf->get_security_config('permissions');`
`317`	`318`	`if($security_config['password_reset_allowed'] == 'yes') {`