Merge branch 'master' of git://anongit.kde.org/owncloud

index.php

@@ -47,7 +47,7 @@ elseif($not_installed OR $install_called) {
 elseif(OC_USER::isLoggedIn()) {
 	if(isset($_GET["logout"]) and ($_GET["logout"])) {
 		OC_USER::logout();
-		header("Location: $WEBROOT");
+		header("Location: ".$WEBROOT.'/');
 		exit();
 	}
 	else {

lib/setup.php

@@ -23,7 +23,7 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 		OC_TEMPLATE::printGuestPage("", "installation", $options);
 	}
 	else {
-		header("Location: $WEBROOT$SUBURI");
+		header("Location: ".$WEBROOT.'/');
 		exit();
 	}
 }