Skip to content

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.

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 8 commits into from
Dec 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d207980
Uploads/Clone: revert version_compare() flip. Split CLI logic.
JJJ Sep 17, 2021
7eea894
Un'revert.
JJJ Sep 17, 2021
a3b41ab
Merge branch 'master' of github.com:stuttter/wp-multi-network into is…
JJJ Sep 26, 2022
09c6a56
Merge branch 'master' of github.com:stuttter/wp-multi-network into is…
JJJ Sep 19, 2024
848606e
Merge branch 'master' into issue/153
JJJ Dec 8, 2025
c76373f
Merge branch 'master' into issue/153
JJJ Dec 8, 2025
7c34c88
Merge branch 'issue/153' of github.com:stuttter/wp-multi-network into…
JJJ Dec 8, 2025
f71a4b7
Merge branch 'master' into issue/153
JJJ 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
9 changes: 5 additions & 4 deletions wp-multi-network/includes/classes/class-wp-ms-network-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ public function create( $args, $assoc_args ) {
$network_admin_id = get_current_user_id();
}

$clone_network = $assoc_args['clone_network'];
$options_to_clone = false;
$clone_network = $assoc_args['clone_network'];

if ( ! empty( $clone_network ) && ! get_network( $clone_network ) ) {
if ( ! empty( $clone_network ) && is_numeric( $clone_network ) && ! get_network( $clone_network ) ) {
WP_CLI::error( sprintf( "Clone network %s doesn't exist.", $clone_network ) );
}

Expand All @@ -98,7 +97,7 @@ public function create( $args, $assoc_args ) {
'user_id' => get_current_user_id(),
'network_admin_id' => $network_admin_id,
'clone_network' => $clone_network,
'options_to_clone' => $options_to_clone,
'options_to_clone' => $assoc_args['options_to_clone'],
)
);

Expand Down Expand Up @@ -264,9 +263,11 @@ public function list_( $args, $assoc_args ) {
public function plugin( $args, $assoc_args ) {
$fetchers_plugin = new \WP_CLI\Fetchers\Plugin();
$action = array_shift( $args );

if ( ! in_array( $action, array( 'activate', 'deactivate' ), true ) ) {
WP_CLI::error( sprintf( '%s is not a supported action.', $action ) );
}

$network_wide = \WP_CLI\Utils\get_flag_value( $assoc_args, 'network' );
$all = \WP_CLI\Utils\get_flag_value( $assoc_args, 'all', false );

Expand Down
5 changes: 2 additions & 3 deletions wp-multi-network/includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,8 @@ function add_network( $args = array() ) {
$new_siteurl = untrailingslashit( get_blogaddress_by_id( $new_blog_id ) );
$upload_url = str_replace( $current_siteurl, $new_siteurl, content_url() );
$upload_url = $upload_url . '/uploads';

$upload_dir = WP_CONTENT_DIR;
$needle = strval( ABSPATH );
$upload_dir = WP_CONTENT_DIR;
$needle = strval( ABSPATH );
if ( 0 === strpos( $upload_dir, $needle ) ) {
$upload_dir = substr( $upload_dir, strlen( $needle ) );
}
Expand Down
Loading