Issue/153 - Uploads/Clone: revert version_compare() flip. Split CLI logic. #184
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
This change reverts part of 60dd9c8 causing issues with upload paths, and ensures that the 'options_to_clone' argument is correctly used.
| @@ -592,7 +592,7 @@ function add_network( $args = array() ) { | |||
| : get_site_option( 'ms_files_rewriting' ); | |||
|
|
|||
| // Not using rewriting, and using a newer version of WordPress than 3.7. | |||
| if ( empty( $use_files_rewriting ) && version_compare( $wp_version, '3.7', '>' ) ) { | |||
| if ( empty( $use_files_rewriting ) && version_compare( $wp_version, '3.7', '<' ) ) { | |||
There was a problem hiding this comment.
@JJJ The new logic is "Not using rewriting, and using an older version of WordPress than 3.7." This results in a new network using blogs.dir since upload_path and upload_url_path are empty.
There was a problem hiding this comment.
@christianwach Reverted the revert 😅
There was a problem hiding this comment.
Reverted the revert 😅
@JJJ 🆒 That still leaves the /sites/*/sites/* conundrum and what to do about it. PR as it stands still produces:
As I said, for new multi-network installs it seems sensible not to append $ms_dir but for existing sites that have that schema? I'm not sure.
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 change reverts part of 60dd9c8 causing issues with upload paths, and ensures that the 'options_to_clone' argument is correctly used.
Fixes #153