Ticket #7779: 7779.patch

src/bp-templates/bp-nouveau/buddypress/common/search/search-form.php

@@ -6 +6 @@
 */
 ?>
 
-<div class="<?php bp_nouveau_search_container_class(); ?> bp-search">
-        <form action="" method="get" class="bp-dir-search-form" id="<?php bp_nouveau_search_selector_id( 'search-form' ); ?>" role="search" data-bp-search="groups">
+<div class="<?php bp_nouveau_search_container_class(); ?> bp-search" data-bp-search="<?php bp_nouveau_search_object_data_attr() ;?>">
+        <form action="" method="get" class="bp-dir-search-form" id="<?php bp_nouveau_search_selector_id( 'search-form' ); ?>" role="search">
 
                 <label for="<?php bp_nouveau_search_selector_id( 'search' ); ?>" class="bp-screen-reader-text"><?php bp_nouveau_search_default_text( '', false ); ?></label>
 

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -1748 +1748 @@
         echo esc_attr( $class );
 }
 
+/**
+ * Output the search form data-bp attribute.
+ *
+ * @since 3.0.0
+ *
+ * @param  string $attr The data-bp attribute.
+ * @return string The data-bp attribute.
+ */
+function bp_nouveau_search_object_data_attr( $attr = '' ) {
+        $objects = bp_nouveau_get_search_objects();
+
+        if ( ! isset( $objects['secondary'] ) ) {
+                return $attr;
+        }
+
+        if ( bp_is_active( 'groups' ) && bp_is_group_members() ) {
+                $attr = join( '_', $objects );
+        } else {
+                $attr = $objects['secondary'];
+        }
+
+        echo esc_attr( $attr );
+}
+
 /**
  * Output a selector ID.
  *