diff --git a/composer.json b/composer.json index ce4b16a985..b9b721bca2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "extra": { "installer-paths": { "public_html/wp-content/themes/{$name}": ["wporg/wporg-parent-2021"], - "public_html/wp-content/mu-plugins-private/{$name}": ["wporg/wporg-mu-plugins"] + "public_html/wp-content/mu-plugins-private/{$name}/pub-sync": ["wporg/wporg-mu-plugins"] } }, "repositories": [ diff --git a/public_html/wp-content/mu-plugins/load-other-mu-plugins.php b/public_html/wp-content/mu-plugins/load-other-mu-plugins.php index c33c1e0870..37cbcbb0d0 100644 --- a/public_html/wp-content/mu-plugins/load-other-mu-plugins.php +++ b/public_html/wp-content/mu-plugins/load-other-mu-plugins.php @@ -29,17 +29,7 @@ function wcorg_include_network_only_plugins() { // Include the public `wporg-mu-plugins` that are synced from Git to SVN. These are different than the // ones included in `wcorg_include_common_plugins()`. - // Production uses an `svn:external` to the sync directory, but the Docker environment can't install that - // because it's a private repository. It installs the open source repo, which has a slightly different - // path. - $wporg_mu_plugins_production_path = dirname( __DIR__ ) . '/mu-plugins-private/wporg-mu-plugins/pub-sync/loader.php'; - $wporg_mu_plugins_dev_path = dirname( __DIR__ ) . '/mu-plugins-private/wporg-mu-plugins/mu-plugins/loader.php'; - - if ( file_exists( $wporg_mu_plugins_production_path ) ) { - require_once $wporg_mu_plugins_production_path; - } else { - require_once $wporg_mu_plugins_dev_path; - } + require_once dirname( __DIR__ ) . '/mu-plugins-private/wporg-mu-plugins/pub-sync/loader.php'; } else { $network_folder = 'wordcamp'; }