Changeset 45667 for trunk/src/wp-includes/comment-template.php
- Timestamp:
- 07/25/2019 12:47:53 AM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/comment-template.php
r45602 r45667 2015 2015 ); 2016 2016 2017 $ r= wp_parse_args( $args, $defaults );2017 $parsed_args = wp_parse_args( $args, $defaults ); 2018 2018 2019 2019 /** … … 2024 2024 * @see wp_list_comments() 2025 2025 * 2026 * @param array $ rAn array of arguments for displaying comments.2027 */ 2028 $ r = apply_filters( 'wp_list_comments_args', $r);2026 * @param array $parsed_args An array of arguments for displaying comments. 2027 */ 2028 $parsed_args = apply_filters( 'wp_list_comments_args', $parsed_args ); 2029 2029 2030 2030 // Figure out what comments we'll be looping through ($_comments) … … 2034 2034 return; 2035 2035 } 2036 if ( 'all' != $ r['type'] ) {2036 if ( 'all' != $parsed_args['type'] ) { 2037 2037 $comments_by_type = separate_comments( $comments ); 2038 if ( empty( $comments_by_type[ $ r['type'] ] ) ) {2038 if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) { 2039 2039 return; 2040 2040 } 2041 $_comments = $comments_by_type[ $ r['type'] ];2041 $_comments = $comments_by_type[ $parsed_args['type'] ]; 2042 2042 } else { 2043 2043 $_comments = $comments; … … 2048 2048 * perform a separate comment query and allow Walker_Comment to paginate. 2049 2049 */ 2050 if ( $ r['page'] || $r['per_page'] ) {2050 if ( $parsed_args['page'] || $parsed_args['per_page'] ) { 2051 2051 $current_cpage = get_query_var( 'cpage' ); 2052 2052 if ( ! $current_cpage ) { … … 2055 2055 2056 2056 $current_per_page = get_query_var( 'comments_per_page' ); 2057 if ( $ r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {2057 if ( $parsed_args['page'] != $current_cpage || $parsed_args['per_page'] != $current_per_page ) { 2058 2058 $comment_args = array( 2059 2059 'post_id' => get_the_ID(), … … 2075 2075 $comments = get_comments( $comment_args ); 2076 2076 2077 if ( 'all' != $ r['type'] ) {2077 if ( 'all' != $parsed_args['type'] ) { 2078 2078 $comments_by_type = separate_comments( $comments ); 2079 if ( empty( $comments_by_type[ $ r['type'] ] ) ) {2079 if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) { 2080 2080 return; 2081 2081 } 2082 2082 2083 $_comments = $comments_by_type[ $ r['type'] ];2083 $_comments = $comments_by_type[ $parsed_args['type'] ]; 2084 2084 } else { 2085 2085 $_comments = $comments; … … 2092 2092 return; 2093 2093 } 2094 if ( 'all' != $ r['type'] ) {2094 if ( 'all' != $parsed_args['type'] ) { 2095 2095 if ( empty( $wp_query->comments_by_type ) ) { 2096 2096 $wp_query->comments_by_type = separate_comments( $wp_query->comments ); 2097 2097 } 2098 if ( empty( $wp_query->comments_by_type[ $ r['type'] ] ) ) {2098 if ( empty( $wp_query->comments_by_type[ $parsed_args['type'] ] ) ) { 2099 2099 return; 2100 2100 } 2101 $_comments = $wp_query->comments_by_type[ $ r['type'] ];2101 $_comments = $wp_query->comments_by_type[ $parsed_args['type'] ]; 2102 2102 } else { 2103 2103 $_comments = $wp_query->comments; … … 2108 2108 $cpage = get_query_var( 'cpage' ); 2109 2109 if ( 'newest' === $default_comments_page ) { 2110 $ r['cpage'] = $cpage;2110 $parsed_args['cpage'] = $cpage; 2111 2111 2112 2112 /* … … 2115 2115 */ 2116 2116 } elseif ( $cpage == 1 ) { 2117 $ r['cpage'] = '';2117 $parsed_args['cpage'] = ''; 2118 2118 } else { 2119 $ r['cpage'] = $cpage;2119 $parsed_args['cpage'] = $cpage; 2120 2120 } 2121 2121 2122 $ r['page'] = 0;2123 $ r['per_page'] = 0;2122 $parsed_args['page'] = 0; 2123 $parsed_args['per_page'] = 0; 2124 2124 } 2125 2125 } 2126 2126 } 2127 2127 2128 if ( '' === $ r['per_page'] && get_option( 'page_comments' ) ) {2129 $ r['per_page'] = get_query_var( 'comments_per_page' );2130 } 2131 2132 if ( empty( $ r['per_page'] ) ) {2133 $ r['per_page'] = 0;2134 $ r['page'] = 0;2135 } 2136 2137 if ( '' === $ r['max_depth'] ) {2128 if ( '' === $parsed_args['per_page'] && get_option( 'page_comments' ) ) { 2129 $parsed_args['per_page'] = get_query_var( 'comments_per_page' ); 2130 } 2131 2132 if ( empty( $parsed_args['per_page'] ) ) { 2133 $parsed_args['per_page'] = 0; 2134 $parsed_args['page'] = 0; 2135 } 2136 2137 if ( '' === $parsed_args['max_depth'] ) { 2138 2138 if ( get_option( 'thread_comments' ) ) { 2139 $ r['max_depth'] = get_option( 'thread_comments_depth' );2139 $parsed_args['max_depth'] = get_option( 'thread_comments_depth' ); 2140 2140 } else { 2141 $ r['max_depth'] = -1;2141 $parsed_args['max_depth'] = -1; 2142 2142 } 2143 2143 } 2144 2144 2145 if ( '' === $ r['page'] ) {2145 if ( '' === $parsed_args['page'] ) { 2146 2146 if ( empty( $overridden_cpage ) ) { 2147 $ r['page'] = get_query_var( 'cpage' );2147 $parsed_args['page'] = get_query_var( 'cpage' ); 2148 2148 } else { 2149 $threaded = ( -1 != $r['max_depth'] );2150 $ r['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;2151 set_query_var( 'cpage', $ r['page'] );2149 $threaded = ( -1 != $parsed_args['max_depth'] ); 2150 $parsed_args['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $parsed_args['per_page'], $threaded ) : 1; 2151 set_query_var( 'cpage', $parsed_args['page'] ); 2152 2152 } 2153 2153 } 2154 2154 // Validation check 2155 $ r['page'] = intval( $r['page'] );2156 if ( 0 == $ r['page'] && 0 != $r['per_page'] ) {2157 $ r['page'] = 1;2158 } 2159 2160 if ( null === $ r['reverse_top_level'] ) {2161 $ r['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );2155 $parsed_args['page'] = intval( $parsed_args['page'] ); 2156 if ( 0 == $parsed_args['page'] && 0 != $parsed_args['per_page'] ) { 2157 $parsed_args['page'] = 1; 2158 } 2159 2160 if ( null === $parsed_args['reverse_top_level'] ) { 2161 $parsed_args['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) ); 2162 2162 } 2163 2163 2164 2164 wp_queue_comments_for_comment_meta_lazyload( $_comments ); 2165 2165 2166 if ( empty( $ r['walker'] ) ) {2166 if ( empty( $parsed_args['walker'] ) ) { 2167 2167 $walker = new Walker_Comment; 2168 2168 } else { 2169 $walker = $ r['walker'];2170 } 2171 2172 $output = $walker->paged_walk( $_comments, $ r['max_depth'], $r['page'], $r['per_page'], $r);2169 $walker = $parsed_args['walker']; 2170 } 2171 2172 $output = $walker->paged_walk( $_comments, $parsed_args['max_depth'], $parsed_args['page'], $parsed_args['per_page'], $parsed_args ); 2173 2173 2174 2174 $in_comment_loop = false; 2175 2175 2176 if ( $ r['echo'] ) {2176 if ( $parsed_args['echo'] ) { 2177 2177 echo $output; 2178 2178 } else {
Note: See TracChangeset
for help on using the changeset viewer.