Changeset 14029

Timestamp:

09/28/2024 03:30:07 AM (6 months ago)

Author:

espellcaste

Message:

Update the conditional that check if bp_classic is available.

Previously, we only checked if the bp_classic function was available, without checking if the plugin was also active.

Props imath, narenin, samedwards, and espellcaste.

Fixes #9181
Closes ​https://github.com/buddypress/buddypress/pull/371

Location:

trunk/src

Files:

• bp-core/bp-core-actions.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/bp-core-update.php (modified) (1 diff)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-core/classes/class-bp-core.php (modified) (1 diff)
• bp-core/deprecated/12.0.php (modified) (1 diff)
• bp-templates/bp-nouveau/buddypress-functions.php (modified) (1 diff)

trunk/src/bp-core/bp-core-actions.php

@@ -123 +123 @@
 
     // Fire a deprecation notice for following deprecated hooks, if needed.
-    if ( ! function_exists( 'bp_classic' ) ) {
+    if ( ! bp_is_classic() ) {
         apply_filters_deprecated( 'bp_uri', array( '' ), '12.0.0' );
         do_action_deprecated( 'is_not_buddypress', array(), '12.0.0' );

trunk/src/bp-core/bp-core-functions.php

@@ -5289 +5289 @@
     return $screen_id === $bp->admin->current_screen;
 }
+
+/**
+ * Common function to check if bp_classic is active or not.
+ *
+ * @since 15.0.0
+ *
+ * @return bool True if bp_classic is active, false otherwise.
+ */
+function bp_is_classic() {
+    return function_exists( 'bp_classic' ) || ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'bp-classic/bp-classic.php' ) );
+}

trunk/src/bp-core/bp-core-update.php

@@ -862 +862 @@
      * when the BP Classic plugin is not active.
      */
-    if ( ! function_exists( 'bp_classic' ) ) {
+    if ( ! bp_is_classic() ) {
         $post_type = bp_core_get_directory_post_type();
 

trunk/src/bp-core/bp-core-wpabstraction.php

@@ -430 +430 @@
 }
 add_action( 'wp_validate_site_deletion', 'bp_delete_site', 10, 2 );
+
+if ( ! function_exists( 'is_plugin_active' ) ) {
+    /**
+     * Checks if a plugin is active.
+     *
+     * @since 15.0.0
+     *
+     * @param string $plugin Plugin path to check.
+     * @return bool True if the plugin is active, false otherwise.
+     */
+    function is_plugin_active( $plugin ) {
+        return in_array( $plugin, (array) get_option( 'active_plugins', array() ), true ) || ( is_multisite() && isset( get_site_option( 'active_sitewide_plugins' )[ $plugin ] ) );
+    }
+}

trunk/src/bp-core/classes/class-bp-core.php

@@ -277 +277 @@
 
         // Only fully deprecate the legacy navigation globals if BP Classic is not active.
-        if ( ! function_exists( 'bp_classic' ) ) {
+        if ( ! bp_is_classic() ) {
             // Backward compatibility for plugins modifying the legacy bp_nav and bp_options_nav global properties.
             $bp->bp_nav         = new BP_Core_BP_Nav_BackCompat();

trunk/src/bp-core/deprecated/12.0.php

@@ -11 +11 @@
 
 // These functions has been moved to the BP Classic plugin.
-if ( ! function_exists( 'bp_classic' ) ) {
+if ( ! bp_is_classic() ) {
     /**
      * Analyze the URI and break it down into BuddyPress-usable chunks.

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -126 +126 @@
             );
 
-            // When BP Classic is activated, regular themes need this filter.
-            if ( function_exists( 'bp_classic' ) ) {
+            // When BP Classic is activated, regular themes need this filter. 
+            if ( bp_is_classic() ) {
                 // Set the BP Uri for the Ajax customizer preview.
                 add_filter( 'bp_uri', array( $this, 'customizer_set_uri' ), 10, 1 );