Don't remove static files if automated static files are turned off #14228
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
Jako
added
bug
JoshuaLuckers
suggested changes
Jan 1, 2019
| } | ||
|
|
||
| /* Check if parent directory is empty, if so remove parent directory. */ | ||
| $pathinfo = pathinfo($this->staticFilePath); |
There was a problem hiding this comment.
Suggested change
| $pathinfo = pathinfo($this->staticFilePath); | |
| $dirname = pathinfo($this->staticFilePath, PATHINFO_DIRNAME); |
| /* Check if parent directory is empty, if so remove parent directory. */ | ||
| $pathinfo = pathinfo($this->staticFilePath); | ||
|
|
||
| if (!empty($pathinfo['dirname'])) { |
There was a problem hiding this comment.
To me it would make more sense to check for things like this in the cleanupStaticDirectories method to prevent code duplication.
| $pathinfo = pathinfo($this->staticFilePath); | ||
|
|
||
| if (!empty($pathinfo['dirname'])) { | ||
| $this->cleanupStaticDirectories($pathinfo['dirname']); |
There was a problem hiding this comment.
Suggested change
| $this->cleanupStaticDirectories($pathinfo['dirname']); | |
| $this->cleanupStaticDirectories($dirname); |
|
@JoshuaLuckers I agree with your review, but code changes that are not bugfixes should be done in 3.x. |
JoshuaLuckers
approved these changes
Jan 2, 2019
Mark-H
added
pr/ready-for-merging
alroniks
pushed a commit
that referenced
this pull request
Jan 12, 2019
…4228 * upstream/pr/14228: Don't remove static files if automated static files are turned off
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.
This really fixes the issue where old static files where removed even if the automate static files system setting was turned off for that element type. It was only partly fixed in #14208, which added a check for removing the file, when the static file path was changed.
What does it do?
A check for the automatic static files system setting is added to the modElementRemoveProcessor class.
Related issue(s)/PR(s)
Issue: #14206, #140206
PR that created the issue: #14135