Fix undefined variable $tmpRoot#6452
Merged
LukasReschke merged 1 commit intoSep 13, 2017
Merged
Conversation
tux-rampage
commented
Sep 11, 2017
| } | ||
|
|
||
| $this->resources[] = array($tmpRoot, $webRoot, $file); | ||
| $this->resources[] = array($webRoot? : '/', $webRoot, $file); |
Contributor
Author
There was a problem hiding this comment.
I'm not sure if this slash is required by the calling code, so I added it if $webRoot is set to '', as it was before refactoring where $tmpRoot contained '/'. Just to make sure the implementation stays compatible.
Contributor
Author
|
Caused by #6332 |
Refactoring of webroot detection left an unused variable. Fixes: nextcloud#6415 Signed-off-by: Axel Helmert <info@luka.de>
tux-rampage
force-pushed
the
hotfix/issue-6415-undefined-variable
branch
from
4d0da5d to
01d4967
Compare
Codecov Report
@@ Coverage Diff @@
## master #6452 +/- ##
===========================================
+ Coverage 53.4% 53.4% +<.01%
Complexity 22518 22518
===========================================
Files 1407 1407
Lines 87093 87096 +3
Branches 1328 1329 +1
===========================================
+ Hits 46509 46512 +3
Misses 40584 40584
|
Contributor
Author
|
Recommited - forgot to sign off 😵 |
Member
|
Restarted the tests, don't think it's related to this pr! |
skjnldsv
requested review from
LukasReschke,
MorrisJobke,
nickvergessen and
rullzer
rullzer
approved these changes
Sep 13, 2017
rullzer
left a comment
rullzer
left a comment
Member
There was a problem hiding this comment.
makes sense and error seems to be gone :)
skjnldsv
approved these changes
Sep 13, 2017
LukasReschke
approved these changes
Sep 13, 2017
Member
|
Okay, I don't know why, but since the merge, it broke my dev install. Reverting the changes makes everything works again! :( |
Member
And so on..... |
Member
|
Yes it breaks for me as well. I guess there was some caching going on. Let me revert |
Merged
Member
|
@rullzer patch is here! Do not revert! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Refactoring of webroot detection left an unused variable as reported in #6415.
This PR fixes this issue.