Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Issue/153 - Uploads/Clone: revert version_compare() flip. Split CLI logic. #184

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

JJJ
Copy link
Collaborator

@JJJ JJJ commented Sep 17, 2021

This change reverts part of 60dd9c8 causing issues with upload paths, and ensures that the 'options_to_clone' argument is correctly used.

Fixes #153

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', '<' ) ) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

Screenshot 2021-09-17 at 16 48 21

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@christianwach Reverted the revert 😅

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted the revert 😅

@JJJ 🆒 That still leaves the /sites/*/sites/* conundrum and what to do about it. PR as it stands still produces:

Screenshot 2021-09-18 at 12 11 04

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.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Uplaod problem /uplaod/sites/136/sites/136
2 participants