mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use proper code flow instead of not needed else branch 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2018-01-25 23:01:03 +01:00
parent b9bbb894f8
commit 16a558871c
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files_external/lib/Lib/Storage/AmazonS3.php
View File

@ -232,7 +232,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
} catch (\Exception $e) {
return $this->batchDelete();
}
return false;
}
private function batchDelete($path = null) {

3
lib/private/Files/Cache/Cache.php
View File

@ -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 [];
}
/**

22
lib/private/User/Session.php
View File

@ -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);
}
/**