Merge branch '801_logo_pandora_comunity_edition' into 'pandora_6.0'

fixed error in login comunity edition

See merge request !425
This commit is contained in:
vgilc 2017-05-03 17:43:16 +02:00
commit 777bea4e8f
2 changed files with 3 additions and 3 deletions

View File

@ -95,8 +95,8 @@ echo '<div id="login_in">';
else{
html_print_image ("images/custom_logo_login/".$config['custom_logo_login'], false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}
}
else if (defined ('PANDORA_ENTERPRISE')) {
}
else if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) {
if (!isset ($config["custom_logo_login"])){
html_print_image ("enterprise/images/custom_logo_login/login_logo.png", false, array ("class" => "login_logo", "alt" => "logo", "border" => 0, "title" => $logo_title), false, true);
}

View File

@ -434,7 +434,7 @@ if (! isset ($config['id_user'])) {
}
db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']);
@db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']);
$_SESSION['id_usuario'] = $nick_in_db;
$config['id_user'] = $nick_in_db;