Changeset 56859
- Timestamp:
- 10/12/2023 02:43:19 PM (9 months ago)
- Location:
- branches/4.6/src
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.6/src/wp-admin/includes/ajax-actions.php
r55783 r56859 3053 3053 $shortcode = wp_unslash( $_POST['shortcode'] ); 3054 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3055 3071 if ( ! empty( $_POST['post_ID'] ) ) { 3056 3072 $post = get_post( (int) $_POST['post_ID'] ); … … 3059 3075 // the embed shortcode requires a post 3060 3076 if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) { 3061 if ( 'embed' === $shortcode) {3077 if ( ) { 3062 3078 wp_send_json_error(); 3063 3079 } -
branches/4.6/src/wp-admin/includes/class-wp-comments-list-table.php
r37674 r56859 495 495 $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); 496 496 497 498 499 500 501 502 503 504 505 506 507 508 509 497 510 echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>"; 498 511 $this->single_row_columns( $comment ); -
branches/4.6/src/wp-admin/includes/class-wp-list-table.php
r38146 r56859 656 656 $pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number ); 657 657 658 // No comments at all. 658 $post_object = get_post( $post_id ); 659 $edit_post_cap = $post_object ? 'edit_post' : 'edit_posts'; 660 if ( 661 current_user_can( $edit_post_cap, $post_id ) || 662 ( 663 empty( $post_object->post_password ) && 664 current_user_can( 'read_post', $post_id ) 665 ) 666 ) { 667 // The user has access to the post and thus can see comments 668 } else { 669 return false; 670 } 671 659 672 if ( ! $approved_comments && ! $pending_comments ) { 660 673 printf( '<span aria-hidden="true">—</span><span class="screen-reader-text">%s</span>', -
branches/4.6/src/wp-admin/includes/dashboard.php
r38028 r56859 917 917 918 918 echo '<ul id="the-comment-list" data-wp-lists="list:comment">'; 919 foreach ( $comments as $comment ) 920 _wp_dashboard_recent_comments_row( $comment ); 919 foreach ( $comments as $comment ) { 920 $comment_post = get_post( $comment->comment_post_ID ); 921 if ( 922 current_user_can( 'edit_post', $comment->comment_post_ID ) || 923 ( 924 empty( $comment_post->post_password ) && 925 current_user_can( 'read_post', $comment->comment_post_ID ) 926 ) 927 ) { 928 _wp_dashboard_recent_comments_row( $comment ); 929 } 930 } 921 931 echo '</ul>'; 922 932 -
branches/4.6/src/wp-includes/Requests/Hooks.php
r38049 r56859 66 66 return true; 67 67 } 68 69 70 71 68 72 } -
branches/4.6/src/wp-includes/Requests/IRI.php
r38728 r56859 704 704 } 705 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 706 720 /** 707 721 * Set the entire IRI. Returns true on success, false on failure (if there -
branches/4.6/src/wp-includes/Requests/Session.php
r38049 r56859 228 228 } 229 229 230 231 232 233 230 234 /** 231 235 * Merge a request's data with the default data -
branches/4.6/src/wp-includes/class-wp-theme.php
r39810 r56859 531 531 532 532 /** 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 533 555 * Adds theme data to cache. 534 556 * … … 1441 1463 return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) ); 1442 1464 } 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1443 1477 } -
branches/4.6/src/wp-includes/media.php
r55783 r56859 1660 1660 } 1661 1661 } elseif ( ! empty( $atts['exclude'] ) ) { 1662 1662 1663 $attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) ); 1663 1664 } else { 1665 1664 1666 $attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) ); 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1665 1678 } 1666 1679 … … 1964 1977 } 1965 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1966 1988 if ( empty( $attachments ) ) { 1967 1989 return ''; -
branches/4.6/src/wp-includes/rest-api.php
r46496 r56859 595 595 596 596 if ( ! $result ) { 597 597 598 return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); 598 599 } -
branches/4.6/src/wp-includes/rest-api/class-wp-rest-server.php
r38037 r56859 244 244 245 245 /** 246 * Send nocache headers on authenticated requests.247 *248 * @since 4.4.0249 *250 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.251 */252 $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );253 if ( $send_no_cache_headers ) {254 foreach ( wp_get_nocache_headers() as $header => $header_value ) {255 $this->send_header( $header, $header_value );256 }257 }258 259 /**260 246 * Filters whether the REST API is enabled. 261 247 * … … 315 301 * header. 316 302 */ 303 317 304 if ( isset( $_GET['_method'] ) ) { 318 305 $request->set_method( $_GET['_method'] ); 319 306 } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) { 320 307 $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ); 308 321 309 } 322 310 … … 376 364 */ 377 365 $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this ); 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 378 384 379 385 if ( ! $served ) { -
branches/4.6/src/wp-includes/shortcodes.php
r37865 r56859 186 186 187 187 /** 188 * Search content for shortcodes and filter shortcodes through their hooks. 188 * Returns a list of registered shortcode names found in the given content. 189 * 190 * Example usage: 191 * 192 * get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' ); 193 * // array( 'audio', 'gallery' ) 194 * 195 * @since 6.3.2 196 * 197 * @param string $content The content to check. 198 * @return string[] An array of registered shortcode names found in the content. 199 */ 200 function get_shortcode_tags_in_content( $content ) { 201 if ( false === strpos( $content, '[' ) ) { 202 return array(); 203 } 204 205 preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); 206 if ( empty( $matches ) ) { 207 return array(); 208 } 209 210 $tags = array(); 211 foreach ( $matches as $shortcode ) { 212 $tags[] = $shortcode[2]; 213 214 if ( ! empty( $shortcode[5] ) ) { 215 $deep_tags = get_shortcode_tags_in_content( $shortcode[5] ); 216 if ( ! empty( $deep_tags ) ) { 217 $tags = array_merge( $tags, $deep_tags ); 218 } 219 } 220 } 221 222 return $tags; 223 } 224 225 /** 226 * Searches content for shortcodes and filter shortcodes through their hooks. 189 227 * 190 228 * If there are no shortcode tags defined, then the content will be returned
Note: See TracChangeset
for help on using the changeset viewer.