Changeset 12188

Timestamp:

07/10/2018 05:19:14 PM (6 years ago)

Author:

r-a-y

Message:

Attachments: Ensure older bp-default themes can still use the Backbone interface.

Since v3.0.0, bp-nouveau is the default template pack. However, for
themes still using a version of the bp-default theme, attempting to
upload results in a fatal error due to a Nouveau function not being
available.

To address this, for bp-default themes, we revert to using the more,
portable bp-legacy attachment template parts.

Props imath, r-a-y.

See #7905 (trunk).

File:

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

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

@@ -975 +975 @@
  */
 function bp_attachments_get_template_part( $slug ) {
-    $attachment_template_part = 'assets/_attachments/' . $slug;
-
-    // Load the attachment template in WP Administration screens.
-    if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
-        $attachment_admin_template_part = buddypress()->themes_dir . '/bp-legacy/buddypress/' . $attachment_template_part . '.php';
-
-        // Check whether the template part exists.
-        if ( ! file_exists( $attachment_admin_template_part ) ) {
-            return false;
-        }
-
-        // Load the template part.
-        require( $attachment_admin_template_part );
-
-    // Load the attachment template in WP_USE_THEMES env.
-    } else {
-        bp_get_template_part( $attachment_template_part );
+    $switched = false;
+
+    /*
+     * Use bp-legacy attachment template part for older bp-default themes or if in
+     * admin area.
+     */
+    if ( ! bp_use_theme_compat_with_current_theme() || ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) ) {
+        $current = bp_get_theme_compat_id();
+        if ( 'legacy' !== $current ) {
+            $switched = true;
+            bp_setup_theme_compat( 'legacy' );
+        }
+    }
+
+    // Load the template part.
+    bp_get_template_part( 'assets/_attachments/' . $slug );
+
+    if ( $switched ) {
+        bp_setup_theme_compat( $current );
     }
 }