Merge pull request #8060 from nextcloud/proper-codeflow
Use proper code flow instead of not needed else branch
This commit is contained in:
commit
43ed8b446c
|
@ -232,7 +232,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
|
|||
} catch (\Exception $e) {
|
||||
return $this->batchDelete();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private function batchDelete($path = null) {
|
||||
|
|
|
@ -208,9 +208,8 @@ class Cache implements ICache {
|
|||
return array_map(function (array $data) {
|
||||
return self::cacheEntryFromData($data, $this->mimetypeLoader);;
|
||||
}, $files);
|
||||
} else {
|
||||
return array();
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -295,15 +295,15 @@ class Session implements IUserSession, Emitter {
|
|||
public function getLoginName() {
|
||||
if ($this->activeUser) {
|
||||
return $this->session->get('loginname');
|
||||
} else {
|
||||
$uid = $this->session->get('user_id');
|
||||
if ($uid) {
|
||||
$this->activeUser = $this->manager->get($uid);
|
||||
return $this->session->get('loginname');
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
$uid = $this->session->get('user_id');
|
||||
if ($uid) {
|
||||
$this->activeUser = $this->manager->get($uid);
|
||||
return $this->session->get('loginname');
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -369,10 +369,10 @@ class Session implements IUserSession, Emitter {
|
|||
if($this->isLoggedIn()) {
|
||||
$this->prepareUserLogin($firstTimeLogin, $regenerateSessionId);
|
||||
return true;
|
||||
} else {
|
||||
$message = \OC::$server->getL10N('lib')->t('Login canceled by app');
|
||||
throw new LoginException($message);
|
||||
}
|
||||
|
||||
$message = \OC::$server->getL10N('lib')->t('Login canceled by app');
|
||||
throw new LoginException($message);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue