Skip to content

Commit

Permalink
Merge pull request #11927 from stweil/clean
Browse files Browse the repository at this point in the history
Remove duplicate condition
  • Loading branch information
rullzer authored Oct 19, 2018
2 parents 93007b6 + 81c0f2a commit f544c9f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions apps/files_sharing/js/sharedfilelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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) {
Expand All @@ -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));
}


Expand Down

0 comments on commit f544c9f

Please sign in to comment.