Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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

New issue

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

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

Already on GitHub? Sign in to your account

Open
JJJ wants to merge 2 commits into master
base: master
Choose a base branch
Loading
from issue/153

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.

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

@christianwach christianwach Sep 17, 2021

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

JJJ reacted with confused emoji
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 😅

Copy link

@christianwach christianwach Sep 18, 2021

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@christianwach christianwach christianwach left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uplaod problem /uplaod/sites/136/sites/136

AltStyle によって変換されたページ (->オリジナル) /