wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11927 from stweil/clean

Browse source 
Remove duplicate condition
This commit is contained in:
Roeland Jago Douma 2018-10-19 21:15:04 +02:00 committed by GitHub
commit f544c9fec9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/files_sharing/js/sharedfilelist.js
View file

@ -244,7 +244,7 @@
return this._reloadCall.then(callBack, callBack);
},
reloadCallback: function(shares, remoteShares, additionnalShares) {
reloadCallback: function(shares, remoteShares, additionalShares) {
delete this._reloadCall;
this.hideMask();
@ -261,8 +261,8 @@
if (remoteShares && remoteShares[0] && remoteShares[0].ocs) {
remoteShares = remoteShares[0];
}
if (additionnalShares && additionnalShares[0] && additionnalShares[0].ocs) {
additionnalShares = additionnalShares[0];
if (additionalShares && additionalShares[0] && additionalShares[0].ocs) {
additionalShares = additionalShares[0];
}
if (shares.ocs && shares.ocs.data) {
@ -273,8 +273,8 @@
files = files.concat(this._makeFilesFromRemoteShares(remoteShares.ocs.data));
}
if (additionnalShares && additionnalShares && additionnalShares.ocs && additionnalShares.ocs.data) {
files = files.concat(this._makeFilesFromShares(additionnalShares.ocs.data, !this._sharedWithUser));
if (additionalShares && additionalShares.ocs && additionalShares.ocs.data) {
files = files.concat(this._makeFilesFromShares(additionalShares.ocs.data, !this._sharedWithUser));
}