Changeset 9045

Timestamp:

09/25/2014 10:01:45 PM (11 years ago)

Author:

imath

Message:

On members directory, make sure search terms containing spaces are well transported in pagination links.

When a profile field output containing spaces was clicked, the member search functionality wasn't creating consistent pagination links. This behavior was introduced by r8928. Patch is fixing the issue and also includes a unit test.

props boonebgorges

Fixes #5898

Location:

trunk

Files:

• src/bp-members/bp-members-template.php (modified) (1 diff)
• src/bp-templates/bp-legacy/js/buddypress.js (modified) (1 diff)
• tests/phpunit/testcases/members/template.php (modified) (1 diff)

trunk/src/bp-members/bp-members-template.php

@@ -276 +276 @@
 
             if ( ! empty( $search_terms ) ) {
-                $pag_args['s'] = $search_terms;
+                $pag_args['s'] = urlencode( $search_terms );
             }
 

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -941 +941 @@
             // Search terms
             if ( jq('div.dir-search input').length ) {
-                search_terms = jq('.dir-search input').val();
+                search_terms =  jq('.dir-search input').prop('placeholder') ? jq('.dir-search input').prop('placeholder') : jq('.dir-search input').val();
             }
 

trunk/tests/phpunit/testcases/members/template.php

@@ -39 +39 @@
 
         $this->assertEquals( $user_ids, $shouldbe );
+    }
+
+    /**
+     * @ticket BP5898
+     * @group bp_has_members
+     */
+    public function test_bp_has_members_search_pagination_with_spaces() {
+        $u1 = $this->create_user( array( 'display_name' => '~ tilde u1' ) );
+        $u2 = $this->create_user( array( 'display_name' => '~ tilde u2' ) );
+
+        $template_args = array(
+            'search_terms' => '~ tilde',
+            'per_page'     => 1,
+        );
+
+        global $members_template;
+        $reset_members_template = $members_template;
+
+        bp_has_members( $template_args );
+
+        preg_match( '/&s=(.*)\'/', $members_template->pag_links, $matches );
+
+        $this->assertEquals( urldecode( $matches[1] ), urldecode( $template_args['search_terms'] ) );
+
+        // reset the members template global
+        $members_template = $reset_members_template;
     }