Changeset 10942 for trunk/src/bp-loader.php

Timestamp:

07/10/2016 09:51:13 PM (8 years ago)

Author:

djpaul

Message:

Core: Fix class autoloader behaviour during new installations.

This change for trunk adds members to the component whitelist within our autoloader implementation.

In r10918, we improved the class autoloader logic introduced in #6853 to support third-party plugins doing class_exists() checks for disabled components. However, new installations of BuddyPress still trigger fatal errors because we missed that the members component is always loaded, not just the core component.

Fixes #7153

Props DJPaul, slaFFik, offereins, mercime, svenl77, scharc, tomas711.

File:

• trunk/src/bp-loader.php (modified) (1 diff)

trunk/src/bp-loader.php

@@ -619 +619 @@
         }
 
-        // Sanity check 2 - Check if component is active before loading class.
-        // Skip if PHPUnit is running.
-        if ( 'core' !== $component && false === bp_is_active( $component ) && false === function_exists( 'tests_add_filter' ) ) {
+        /*
+         * Sanity check 2 - Check if component is active before loading class.
+         * Skip if PHPUnit is running, or BuddyPress is installing for the first time.
+         */
+        if (
+            ! in_array( $component, array( 'core', 'members' ), true ) &&
+            ! bp_is_active( $component ) &&
+            ! function_exists( 'tests_add_filter' )
+        ) {
             return;
         }