Skip to content

Prevent duplicate /sites/{blog_id} path in upload directory setup #228

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.

Sign up for GitHub

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

Merged
JJJ merged 13 commits into from
Dec 8, 2025
Merged

Prevent duplicate /sites/{blog_id} path in upload directory setup #228

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
da9baa9
Initial plan
Copilot Dec 8, 2025
6da51c5
Fix duplicate /sites/{blog_id} in upload paths
Copilot Dec 8, 2025
78da09e
Update comment to correctly reflect WordPress version requirement
Copilot Dec 8, 2025
13b4dc3
Check for existing site path before appending to prevent duplication
Copilot Dec 8, 2025
13cbf4c
Fix logic error: only update upload_path when adding suffix
Copilot Dec 8, 2025
e9871f4
Add unit tests for upload path handling
Copilot Dec 8, 2025
109a258
Improve test code: fix regex pattern and clarify comment
Copilot Dec 8, 2025
868e80e
Enhance upload path tests with groups, tickets, and efficiency improv…
Copilot Dec 8, 2025
9b388df
Refactor tests: add helper method to eliminate code duplication
Copilot Dec 8, 2025
f640750
Remove README-upload-tests.md and merge content into TESTING.md
Copilot Dec 8, 2025
3c59f35
Fix test failures: add user_id to all add_network() calls
Copilot Dec 8, 2025
902da85
Grant super admin privileges and rename user_id to superadmin_id
Copilot Dec 8, 2025
89512ff
Fix network domain conflict in test_upload_path_without_duplication
Copilot Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions wp-multi-network/includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,15 +622,16 @@ function add_network( $args = array() ) {
}
$upload_dir .= '/uploads';

if ( defined( 'MULTISITE' ) ) {
$ms_dir = '/sites/' . $new_blog_id;
} else {
$ms_dir = '/' . $new_blog_id;
// Check if wpmu_create_blog() already set the site-specific path.
$existing_upload_path = get_blog_option( $new_blog_id, 'upload_path' );
$site_path_suffix = defined( 'MULTISITE' ) ? '/sites/' . $new_blog_id : '/' . $new_blog_id;

// Only add the site-specific path if it's not already present.
if ( empty( $existing_upload_path ) || false === strpos( $existing_upload_path, $site_path_suffix ) ) {
$upload_dir .= $site_path_suffix;
$upload_url .= $site_path_suffix;
}

$upload_dir .= $ms_dir;
$upload_url .= $ms_dir;

update_blog_option( $new_blog_id, 'upload_path', $upload_dir );
update_blog_option( $new_blog_id, 'upload_url_path', $upload_url );
}
Expand Down
Loading