Changeset 8158

Timestamp:

03/25/2014 06:40:56 PM (11 years ago)

Author:

boonebgorges

Message:

Don't register the bp-themes themes directory if bp-default is found elsewhere in the installation

This will be part of the migration path away from the packaged version of
bp-default. bp-default will be added to the wordpress.org theme repository with
a higher version number, prompting an upgrade that will result in an
installation into the standard WP themes directory. Once that happens, most
installations will no longer be reliant on the version of bp-default packaged
with BuddyPress.

See #5212

Props DJPaul

File:

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

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

@@ -606 +606 @@
  */
 function bp_do_register_theme_directory() {
+    // If bp-default exists in another theme directory, bail.
+    // This ensures that the version of bp-default in the regular themes
+    // directory will always take precedence, as part of a migration away
+    // from the version packaged with BuddyPress
+    foreach ( array_values( (array) $GLOBALS['wp_theme_directories'] ) as $directory ) {
+        if ( is_dir( $directory . '/bp-default' ) ) {
+            return false;
+        }
+    }
+
+    // If the current theme is bp-default (or a bp-default child), BP
+    // should register its directory
     $register = 'bp-default' === get_stylesheet() || 'bp-default' === get_template();