Skip to content

Conversation

@nickvergessen
Copy link
Member

Signed-off-by: Joas Schilling coding@schilljs.com

return $folder === 'files';
} else {
list($folder) = explode('/', $file, 2);
[$folder, $subPath] = explode('/', $file, 2);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There might not be a slash, so this needs more fixing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a commit to return early so we don't try to explode the file path if if just contains the base __groupfolders path

@juliusknorr juliusknorr added this to the Nextcloud 18 milestone Nov 15, 2019
@juliusknorr
Copy link
Member

/backport to stable17

@juliusknorr
Copy link
Member

/backport to stable16

@nickvergessen
Copy link
Member Author

What happened here, the PR is against stable16? :P

@juliusknorr
Copy link
Member

Ah right, then I guess it needs some forward-porting. 🙈

@nickvergessen nickvergessen force-pushed the testing-groupfolder-issues branch from 85605b0 to 36365b5 Compare November 19, 2019 09:38
@nickvergessen nickvergessen changed the base branch from stable16 to master November 19, 2019 09:38
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the testing-groupfolder-issues branch from 36365b5 to 6e1c112 Compare November 19, 2019 09:38
@nickvergessen
Copy link
Member Author

Rebased onto latest master. It actually was master based, that's why the unit tests against stable16 failed :D
So we can merge this once the tests ran

@nickvergessen
Copy link
Member Author

Failing tests are due to #85

So lets just merge this now

@nickvergessen nickvergessen merged commit a1efc76 into master Nov 19, 2019
@delete-merged-branch delete-merged-branch bot deleted the testing-groupfolder-issues branch November 19, 2019 10:42
@backportbot-nextcloud
Copy link

backport to stable17 in #88

@backportbot-nextcloud
Copy link

backport to stable16 in #89

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants