Changeset 5891 for trunk/bp-groups/bp-groups-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-groups/bp-groups-template.php (modified) (4 diffs)

trunk/bp-groups/bp-groups-template.php

@@ -108 +108 @@
     var $order;
 
-    function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras, $include = false, $exclude = false, $show_hidden = false ) {
-        $this->__construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden );
-    }
-
-    function __construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras, $include = false, $exclude = false, $show_hidden = false ){
-
-        $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
+    function __construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $populate_extras, $include = false, $exclude = false, $show_hidden = false, $page_arg = 'grpage' ){
+
+        $this->pag_page = isset( $_REQUEST[$page_arg] ) ? intval( $_REQUEST[$page_arg] ) : $page;
         $this->pag_num  = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
 
@@ -171 +167 @@
         if ( (int) $this->total_group_count && (int) $this->pag_num ) {
             $this->pag_links = paginate_links( array(
-                'base'      => add_query_arg( array( 'grpage' => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
+                'base'      => add_query_arg( array( $page_arg => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
                 'format'    => '',
                 'total'     => ceil( (int) $this->total_group_count / (int) $this->pag_num ),
@@ -266 +262 @@
         'show_hidden'     => false,
 
+        'page_arg'        => 'grpage', // See https://buddypress.trac.wordpress.org/ticket/3679
+
         'user_id'         => $user_id, // Pass a user ID to limit to groups this user has joined
         'slug'            => $slug,    // Pass a group slug to only return that group
@@ -287 +285 @@
     }
 
-    $groups_template = new BP_Groups_Template( (int) $user_id, $type, (int) $page, (int) $per_page, (int) $max, $slug, $search_terms, (bool)$populate_extras, $include, $exclude, $show_hidden );
+    $groups_template = new BP_Groups_Template( (int) $user_id, $type, (int) $page, (int) $per_page, (int) $max, $slug, $search_terms, (bool)$populate_extras, $include, $exclude, $show_hidden, $page_arg );
     return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template );
 }