Skip to content

Commit

Permalink
wip simpler if works everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
iandunn committed Dec 23, 2023
1 parent d5773e0 commit 4ee9e11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
12 changes: 1 addition & 11 deletions public_html/wp-content/mu-plugins/load-other-mu-plugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
Expand Down

0 comments on commit 4ee9e11

Please sign in to comment.