diff options
author | Robin Appelman <icewind1991@gmail.com> | 2011-07-22 00:47:35 +0200 |
---|---|---|
committer | Robin Appelman <icewind1991@gmail.com> | 2011-07-22 00:47:35 +0200 |
commit | e6e14719c965d0f2b32dcb814e49939df1e7415c (patch) | |
tree | eeaf36e40dc807085b7feea32a3afb801c8ac7de | |
parent | 9be2dc8290eac4849c8663e2f8eefa3b8882c4fa (diff) | |
parent | 9d1c5c855bb1e5708d46960b3ad08acd805a6186 (diff) | |
download | nextcloud-server-e6e14719c965d0f2b32dcb814e49939df1e7415c.tar.gz nextcloud-server-e6e14719c965d0f2b32dcb814e49939df1e7415c.zip |
Merge branch 'master' into interface
-rw-r--r-- | index.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/index.php b/index.php index 2e2d495fda6..dfd75492709 100644 --- a/index.php +++ b/index.php @@ -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)); + } } ?>
\ No newline at end of file |