Changeset 5472

Timestamp:

12/09/2011 04:49:04 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add more common paths to BP_Component::includes method. Also add some stripslashing. Fixes #3823.

File:

• trunk/bp-core/bp-core-component.php (modified) (1 diff)

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

@@ -174 +174 @@
                         return;
 
+                $slashed_path = trailingslashit( $this->path );
+
                 // Loop through files to be included
                 foreach ( $includes as $file ) {
 
-                        // Check path + file
-                        if ( @is_file( $this->path . '/' . $file ) )
-                                require( $this->path . '/' . $file );
-
-                        // Check path + /bp-component/ + file
-                        elseif ( @is_file( $this->path . '/bp-' . $this->id . '/' . $file ) )
-                                require( $this->path . '/bp-' . $this->id . '/' . $file );
-
-                        // Check buddypress/bp-component/bp-component-$file.php
-                        elseif ( @is_file( $this->path . '/bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php' ) )
-                                require( $this->path . '/bp-' . $this->id . '/bp-' . $this->id . '-' . $file . '.php' );
-
+                        $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 );
+                                        continue;
+                                }
+                        }
                 }