Fix \OC_App::getCurrentApp() when being called from CLI or phpunit #31876
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
requested review from
come-nc,
a team,
blizzz and
skjnldsv
and removed request for
a team
come-nc
reviewed
Apr 7, 2022
Comment on lines
+632
to
+634
| if (\OC::$CLI) { | ||
| return ''; | ||
| } |
There was a problem hiding this comment.
Is this related? What does it fix?
There was a problem hiding this comment.
It fixes the case when this is called via cron/cli/occ
We don't need to do anything in that case, but it's not set to true when running tests
come-nc
reviewed
Apr 7, 2022
Signed-off-by: Joas Schilling <coding@schilljs.com>
skjnldsv
approved these changes
Apr 7, 2022
Merged
come-nc
approved these changes
Apr 7, 2022
blizzz
approved these changes
Apr 7, 2022
|
/backport to stable23 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the failing tests in activity: nextcloud/activity#777