Clean up hack.

2 files changed, 3 insertions, 4 deletions

diff --git a/3rdparty b/3rdparty
-Subproject a13af72fbe8983686fc47489a750e60319f68ac
diff --git a/lib/base.php b/lib/base.php
index 8622d0f8bf1..42d8fb3c8d9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -572,6 +572,7 @@ class OC {
 		}
 
 		OC::tryBasicAuthLogin();
+
 		if (!self::$CLI) {
 			try {
 				if (!OC_Config::getValue('maintenance', false)) {
@@ -679,9 +680,8 @@ class OC {
 			$error[] = 'invalidpassword';
 
 			// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-		} elseif (OC::tryBasicAuthLogin()) {
-			$error[] = 'invalidpassword';
 		}
+
 		OC_Util::displayLoginPage(array_unique($error));
 	}
 
@@ -779,8 +779,6 @@ class OC {
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
 			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
-			$_REQUEST['redirect_url'] = OC_Request::requestUri();
-			//OC_Util::redirectToDefaultPage();
 		}
 		return true;
 	}