Ticket #4081: improve-faulty-conditional.patch

bp-core/bp-core-template.php

@@ -780 +780 @@
                 // Next, check to see whether $component is a canonical,
                 // non-translatable component name. If so, we can return its
                 // corresponding slug from $bp->active_components.
-                } else if ( $key = array_search( $component, $bp->active_components ) ) {
-                        if ( strstr( $bp->current_component, $key ) ) {
-                                $is_current_component = true;
-                        }
+                } elseif ( array_key_exists( $component, $bp->active_components ) && $bp->current_component == $component ) {
+                        $is_current_component = true;
 
                 // If we haven't found a match yet, check against the root_slugs
                 // created by $bp->pages, as well as the regular slugs