Changeset 12737

Timestamp:

09/26/2020 06:11:39 PM (4 months ago)

Author:

espellcaste

Message:

Update the BP CLI package to the 2.0 version (​https://github.com/buddypress/wp-cli-buddypress/releases/tag/2.0).

Also, add a conditional to avoid conflict with the BuddyPress plugin version. This makes sure
there is no conflict when the package is installed via the wp package install buddypress command.

Props imath

Fixes #8308

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/class-buddypress.php (modified) (1 diff)

trunk/Gruntfile.js

@@ -319 +319 @@
             },
             cli: {
-                command: 'svn export --force https://github.com/buddypress/wp-cli-buddypress.git/tags/1.8 cli',
+                command: 'svn export --force https://github.com/buddypress/wp-cli-buddypress.git/tags/2.0 cli',
                 cwd: BUILD_DIR,
                 stdout: false

trunk/src/class-buddypress.php

@@ -514 +514 @@
         }
 
-        // Load wp-cli module if PHP 5.4+.
-        if ( defined( 'WP_CLI' ) && file_exists( $this->plugin_dir . 'cli/wp-cli-bp.php' ) && version_compare( phpversion(), '5.4.0', '>=' ) ) {
+        // Load wp-cli module if PHP 5.6+.
+        if (
+            defined( 'WP_CLI' )
+            && ! class_exists( 'Buddypress\CLI\Command\BuddypressCommand' )
+            && file_exists( $this->plugin_dir . 'cli/wp-cli-bp.php' )
+            && version_compare( phpversion(), '5.6.0', '>=' ) ) {
             require( $this->plugin_dir . 'cli/wp-cli-bp.php' );
         }