Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19200 from woocommerce/fix/installed-plugin-not-activated-if-directory-not-matching-slug 

Activate plugins during installation process even if directory doesn't match slug
This commit is contained in:
Mike Jolley 2018-03-07 12:00:14 +00:00 committed by GitHub
parent 7c2ed135d5 08e8ca7823
commit fdab6665c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
includes/class-wc-install.php
View File

@ -1045,15 +1045,16 @@ CREATE TABLE {$wpdb->prefix}woocommerce_termmeta (
} }
/** /**
* Get slug from path * Get slug from path and associate it with the path.
* *
* @param string $key Plugin relative path. Example: woocommerce/woocommerce.php. * @param array $plugins Associative array of plugin slugs to paths.
* @return string * @param string $key Plugin relative path. Example: woocommerce/woocommerce.php.
*/ */
private static function format_plugin_slug( $key ) { private static function associate_plugin_slug( $plugins, $key ) {
$slug = explode( '/', $key ); $slug = explode( '/', $key );
$slug = explode( '.', end( $slug ) ); $slug = explode( '.', end( $slug ) );
return $slug[0]; $plugins[ $slug[0] ] = $key;
return $plugins;
} }
/** /**
@ -1079,16 +1080,15 @@ CREATE TABLE {$wpdb->prefix}woocommerce_termmeta (
$skin = new Automatic_Upgrader_Skin(); $skin = new Automatic_Upgrader_Skin();
$upgrader = new WP_Upgrader( $skin ); $upgrader = new WP_Upgrader( $skin );
$installed_plugins = array_map( array( __CLASS__, 'format_plugin_slug' ), array_keys( get_plugins() ) ); $installed_plugins = array_reduce( array_keys( get_plugins() ), array( __CLASS__, 'associate_plugin_slug' ), array() );
$plugin_slug = $plugin_to_install['repo-slug']; $plugin_slug = $plugin_to_install['repo-slug'];
$plugin = $plugin_slug . '/' . $plugin_slug . '.php';
$installed = false; $installed = false;
$activate = false; $activate = false;
// See if the plugin is installed already. // See if the plugin is installed already.
if ( in_array( $plugin_to_install['repo-slug'], $installed_plugins ) ) { if ( isset( $installed_plugins[ $plugin_slug ] ) ) {
$installed = true; $installed = true;
$activate = ! is_plugin_active( $plugin ); $activate = ! is_plugin_active( $installed_plugins[ $plugin_slug ] );
} }
// Install this thing! // Install this thing!
@ -1178,7 +1178,7 @@ CREATE TABLE {$wpdb->prefix}woocommerce_termmeta (
// Activate this thing. // Activate this thing.
if ( $activate ) { if ( $activate ) {
try { try {
$result = activate_plugin( $plugin ); $result = activate_plugin( $installed_plugins[ $plugin_slug ] );
if ( is_wp_error( $result ) ) { if ( is_wp_error( $result ) ) {
throw new Exception( $result->get_error_message() ); throw new Exception( $result->get_error_message() );