From 64604dedaf7ff5c86db5e5e7d82de62ba3a1df2c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 11 Nov 2015 09:07:53 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/login/index.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 6dd838a..f2d0e60 100644
--- 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') {
--
Gitblit v1.9.1