Merge branch '784-Fallo-de-seguridad-critico.-Eliminación-de-licencia-dev' into 'develop'

Fixed license failure

See merge request !418
This commit is contained in:
vgilc 2017-04-28 13:32:13 +02:00
commit 77482670d6

View File

@ -101,11 +101,6 @@ if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
header ("Location: " . $config['homeurl'] . "enterprise/meta"); header ("Location: " . $config['homeurl'] . "enterprise/meta");
} }
/* Enterprise support */
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
include_once (ENTERPRISE_DIR . "/load_enterprise.php");
}
if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) { if (file_exists (ENTERPRISE_DIR . "/include/functions_login.php")) {
include_once (ENTERPRISE_DIR . "/include/functions_login.php"); include_once (ENTERPRISE_DIR . "/include/functions_login.php");
} }
@ -587,6 +582,12 @@ else {
} }
} }
} }
/* Enterprise support */
if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
include_once (ENTERPRISE_DIR . "/load_enterprise.php");
}
// Log off // Log off
if (isset ($_GET["bye"])) { if (isset ($_GET["bye"])) {
include ("general/logoff.php"); include ("general/logoff.php");