Changeset 5891 for trunk/bp-members/bp-members-template.php

Timestamp:

03/06/2012 07:15:09 AM (13 years ago)

Author:

djpaul

Message:

Allow pagination arguments for template loops to be renamed. Remove PHP4 constructors. Fixes #3679, props r-a-y and cnorris23

File:

• trunk/bp-members/bp-members-template.php (modified) (6 diffs)

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

@@ -170 +170 @@
     var $total_member_count;
 
-    function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value ) {
-
-        $this->pag_page = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int) $page_number;
+    function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value, $page_arg = 'upage' ) {
+
+        $this->pag_page = !empty( $_REQUEST[$page_arg] ) ? intval( $_REQUEST[$page_arg] ) : (int) $page_number;
         $this->pag_num  = !empty( $_REQUEST['num'] )   ? intval( $_REQUEST['num'] )   : (int) $per_page;
         $this->type     = $type;
@@ -200 +200 @@
         if ( (int) $this->total_member_count && (int) $this->pag_num ) {
             $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( 'upage', '%#%' ),
+                'base'      => add_query_arg( $page_arg, '%#%' ),
                 'format'    => '',
                 'total'     => ceil( (int) $this->total_member_count / (int) $this->pag_num ),
@@ -286 +286 @@
         'max'             => false,
 
+        'page_arg'        => 'upage',       // See https://buddypress.trac.wordpress.org/ticket/3679
+
         'include'         => false,         // Pass a user_id or a list (comma-separated or array) of user_ids to only show these users
         'exclude'         => false,         // Pass a user_id or a list (comma-separated or array) of user_ids to exclude these users
@@ -317 +319 @@
         return false;
 
-    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude, $meta_key, $meta_value );
+    $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude, $meta_key, $meta_value, $page_arg );
     return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
 }
@@ -867 +869 @@
 
 function bp_displayed_user_id() {
-    
+
     static $id = 0;
-    
+
     if ( empty( $id ) ) {
         global $bp;
@@ -881 +883 @@
 
     static $id = 0;
-    
+
     if ( empty( $id ) ) {
         global $bp;