[CMSP-899] Remove our global for the upload_dir infinite loop
#34
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
|
Tracked here |
pwtyler
changed the title
upload_dir infinite loopupload_dir infinite loop
|
this PR is confirmed working with WP 6.5-beta3-57756 & Gutenberg 17.8.2 (active and deactivated). |
pwtyler
approved these changes
Mar 4, 2024
Comment on lines
+26
to
31
| $upload_dir = wp_get_upload_dir(); | ||
|
|
||
| // Set our font directory. | ||
| $font_dir = $_pantheon_upload_dir['basedir'] . '/fonts'; | ||
| $font_url = $_pantheon_upload_dir['baseurl'] . '/fonts'; | ||
| $font_dir = $upload_dir['basedir'] . '/fonts'; | ||
| $font_url = $upload_dir['baseurl'] . '/fonts'; | ||
|
|
There was a problem hiding this comment.
Can't make a suggestion on the whole function with the structure of the diff— I took a stab at simplifying but I'm swinging back and forth over here whether the following makes it less readable. Apply if you wish.
function pantheon_font_dir( $defaults ) {
$upload_dir = wp_get_upload_dir();
// Set our font directory.
$defaults['basedir'] = $upload_dir['basedir'] . '/fonts';
$defaults['baseurl'] = $upload_dir['baseurl'] . '/fonts';
$defaults['path'] = $defaults['basedir'];
$defaults['url'] = $defaults['baseurl'];
return $defaults;
}
There was a problem hiding this comment.
I feel like defining $font_dir/$font_url and then saving those to the various $defaults values is more explicit about what's going on.
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.
Per WordPress/gutenberg#58839 the issue causing the infinite loop when
upload_diris used insidefont_dirshould be addressed.This change removes our workaround for that issue and uses
wp_get_upload_dirdirectly in thefont_dirfolder.Note: While these changes have been merged into Gutenberg, they have not yet been merged into core or made part of the latest Gutenberg release. This should not be merged until this can be tested and confirmed working (PHP Unit tests are not sufficient).
Todo: