Changeset 8572

Timestamp:

07/09/2014 07:41:07 PM (12 years ago)

Author:

johnjamesjacoby

Message:

In BP_Component::includes(), ensure dynamic action fires even when $includes array is empty.

File:

• trunk/src/bp-core/bp-core-component.php (modified) (2 diffs)

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

@@ -293 +293 @@
 
                 // Bail if no files to include
-                if ( empty( $includes ) )
-                        return;
-
-                $slashed_path = trailingslashit( $this->path );
-
-                // Loop through files to be included
-                foreach ( (array) $includes as $file ) {
-
-                        $paths = array(
-
-                                // Passed with no extension
-                                'bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php',
-                                'bp-' . $this->id . '-' . $file . '.php',
-                                'bp-' . $this->id . '/' . $file . '.php',
-
-                                // Passed with extension
-                                $file,
-                                'bp-' . $this->id . '-' . $file,
-                                'bp-' . $this->id . '/' . $file,
-                        );
-
-                        foreach ( $paths as $path ) {
-                                if ( @is_file( $slashed_path . $path ) ) {
-                                        require( $slashed_path . $path );
-                                        break;
+                if ( ! empty( $includes ) ) {
+                        $slashed_path = trailingslashit( $this->path );
+
+                        // Loop through files to be included
+                        foreach ( (array) $includes as $file ) {
+
+                                $paths = array(
+
+                                        // Passed with no extension
+                                        'bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php',
+                                        'bp-' . $this->id . '-' . $file . '.php',
+                                        'bp-' . $this->id . '/' . $file . '.php',
+
+                                        // Passed with extension
+                                        $file,
+                                        'bp-' . $this->id . '-' . $file,
+                                        'bp-' . $this->id . '/' . $file,
+                                );
+
+                                foreach ( $paths as $path ) {
+                                        if ( @is_file( $slashed_path . $path ) ) {
+                                                require( $slashed_path . $path );
+                                                break;
+                                        }
                                 }
                         }
-                }
+        }
 
                 // Call action
@@ -427 +426 @@
 
                 // Bail if this is an ajax request
-                if ( defined( 'DOING_AJAX' ) )
+                if ( defined( 'DOING_AJAX' ) ) {
                         return;
+                }
 
                 // Do not proceed if BP_USE_WP_ADMIN_BAR constant is not set or is false
-                if ( !bp_use_wp_admin_bar() )
+                if ( ! bp_use_wp_admin_bar() ) {
                         return;
+                }
 
                 // Filter the passed admin nav