Merge branch 'master' into interface

This commit is contained in:
Robin Appelman 2011-07-22 00:47:35 +02:00
commit e6e14719c9
1 changed files with 10 additions and 2 deletions

View File

@ -69,14 +69,22 @@ elseif(isset($_POST["user"])) {
exit();
}
else {
OC_TEMPLATE::printGuestPage("", "login", array("error" => true, "username" => $_COOKIE["username"]));
if(isset($_COOKIE["username"])){
OC_TEMPLATE::printGuestPage("", "login", array("error" => true, "username" => $_COOKIE["username"]));
}else{
OC_TEMPLATE::printGuestPage("", "login", array("error" => true));
}
}
}
// For all others cases, we display the guest page :
else {
OC_APP::loadApps();
OC_TEMPLATE::printGuestPage("", "login", array("error" => false, "username" => $_COOKIE["username"]));
if(isset($_COOKIE["username"])){
OC_TEMPLATE::printGuestPage("", "login", array("error" => false, "username" => $_COOKIE["username"]));
}else{
OC_TEMPLATE::printGuestPage("", "login", array("error" => false));
}
}
?>