Ticket #6715: 6715.patch

src/bp-core/bp-core-theme-compatibility.php

@@ -531 +531 @@
         global $content_width;
 
         // If the current theme doesn't need theme compat, bail at this point.
-        if ( ! bp_use_theme_compat_with_current_theme() ) {
+        if ( ! bp_use_theme_compat_with_current_theme() || bp_is_deactivation() ) {
                 return;
         }