Ticket #3059: bbpress-3059.1.diff
File bbpress-3059.1.diff, 1.4 KB (added by , 14 years ago) |
---|
-
bb-includes/class.bb-query.php
201 201 // 'page', // Defaults to global or number in URI 202 202 // 'per_page', // Defaults to page_topics 203 203 'tag_id', // one tag ID 204 'favorites' // one user ID 204 'favorites', // one user ID, 205 'offset', // first item to query 206 'number' // number of items to retrieve 205 207 ); 206 208 207 209 $parse_ints = array( … … 718 720 $bits['order_by'] .= " $q[order]"; 719 721 else 720 722 $bits['order_by'] .= " DESC"; 721 722 if ( !$q['per_page'] ) 723 $q['per_page'] = (int) bb_get_option( 'page_topics' ); 724 723 725 724 $bits['limit'] = ''; 726 if ( $q['per_page'] > 0 ) : 727 if ( $q['page'] > 1 ) 728 $bits['limit'] .= $q['per_page'] * ( $q['page'] - 1 ) . ", "; 729 $bits['limit'] .= $q['per_page']; 730 endif; 731 725 726 if ( !empty( $q['offset'] ) && !empty( $q['number'] ) ) { 727 // When offset and number are provided, we skip per_page and limit checks 728 $bits['limit'] .= $q['offset'] . ", " . $q['number']; 729 } else { 730 if ( !$q['per_page'] ) 731 $q['per_page'] = (int) bb_get_option( 'page_topics' ); 732 733 if ( $q['per_page'] > 0 ) : 734 if ( $q['page'] > 1 ) 735 $bits['limit'] .= $q['per_page'] * ( $q['page'] - 1 ) . ", "; 736 $bits['limit'] .= $q['per_page']; 737 endif; 738 } 739 732 740 $name = "get_{$this->type}s_"; 733 741 734 742 // Unfiltered