Merge branch '1.10RC'1.10

1 files changed, 4 insertions, 12 deletions

diff --git a/include/api_auth.php b/include/api_auth.php
index dc8492b20..89882f821 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -59,21 +59,13 @@ function api_login(&$a){
 	if(isset($_SERVER['PHP_AUTH_USER'])) {
 		$channel_login = 0;
 		$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
-		if(! $record) {
-	        $r = q("select * from channel left join account on account.account_id = channel.channel_account_id 
-				where channel.channel_address = '%s' limit 1",
-		       dbesc($_SERVER['PHP_AUTH_USER'])
-			);
-        	if ($r) {
-				$record = account_verify_password($r[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
-				if($record)
-					$channel_login = $r[0]['channel_id'];
-			}
+		if($record && $record['channel']) {
+			$channel_login = $record['channel']['channel_id'];
 		}
 	}
 
-	if($record) {
-		authenticate_success($record);
+	if($record['account']) {
+		authenticate_success($record['account']);
 
 		if($channel_login)
 			change_channel($channel_login);