Changeset 12015

Timestamp:

04/29/2018 06:48:38 PM (8 years ago)

Author:

imath

Message:

BP Nouveau: fix Ajax search in directory pages & group members screen

Fixes #7779

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress/common/search/search-form.php (modified) (1 diff)
• includes/template-tags.php (modified) (1 diff)

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

@@ -7 +7 @@
 ?>
 
-<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>

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

@@ -1750 +1750 @@
 
 /**
+ * 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.
  *