Changeset 56886
- Timestamp:
- 10/12/2023 03:15:04 PM (11 months ago)
- Location:
- branches/5.7
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.7
- Property svn:mergeinfo changed
/trunk merged: 56833-56838
- Property svn:mergeinfo changed
-
branches/5.7/src/wp-admin/includes/ajax-actions.php
r55778 r56886 3766 3766 $shortcode = wp_unslash( $_POST['shortcode'] ); 3767 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3768 3784 if ( ! empty( $_POST['post_ID'] ) ) { 3769 3785 $post = get_post( (int) $_POST['post_ID'] ); … … 3772 3788 // The embed shortcode requires a post. 3773 3789 if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) { 3774 if ( 'embed' === $shortcode) {3790 if ( ) { 3775 3791 wp_send_json_error(); 3776 3792 } -
branches/5.7/src/wp-admin/includes/class-wp-comments-list-table.php
r49193 r56886 622 622 } 623 623 $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID ); 624 625 626 627 628 629 630 631 632 633 634 635 636 624 637 625 638 echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>"; -
branches/5.7/src/wp-admin/includes/class-wp-list-table.php
r50362 r56886 735 735 $pending_comments_number 736 736 ); 737 738 739 740 741 742 743 744 745 746 747 748 749 750 737 751 738 752 if ( ! $approved_comments && ! $pending_comments ) { -
branches/5.7/src/wp-admin/includes/dashboard.php
r50234 r56886 1053 1053 echo '<ul id="the-comment-list" data-wp-lists="list:comment">'; 1054 1054 foreach ( $comments as $comment ) { 1055 _wp_dashboard_recent_comments_row( $comment ); 1055 1056 $comment_post = get_post( $comment->comment_post_ID ); 1057 if ( 1058 current_user_can( 'edit_post', $comment->comment_post_ID ) || 1059 ( 1060 empty( $comment_post->post_password ) && 1061 current_user_can( 'read_post', $comment->comment_post_ID ) 1062 ) 1063 ) { 1064 _wp_dashboard_recent_comments_row( $comment ); 1065 } 1056 1066 } 1057 1067 echo '</ul>'; -
branches/5.7/src/wp-admin/includes/user.php
r49927 r56886 600 600 * 601 601 * @since 5.6.0 602 603 602 604 * 603 605 * @param array $request { … … 615 617 $error = new WP_Error(); 616 618 617 if ( ! empty( $request['success_url'] ) ) { 618 $scheme = wp_parse_url( $request['success_url'], PHP_URL_SCHEME ); 619 620 if ( 'http' === $scheme ) { 619 if ( isset( $request['success_url'] ) ) { 620 $validated_success_url = wp_is_authorize_application_redirect_url_valid( $request['success_url'] ); 621 if ( is_wp_error( $validated_success_url ) ) { 621 622 $error->add( 622 'invalid_redirect_scheme',623 __( 'The success url must be served over a secure connection.')623 , 624 ) 624 625 ); 625 626 } 626 627 } 627 628 628 if ( ! empty( $request['reject_url'] ) ) { 629 $scheme = wp_parse_url( $request['reject_url'], PHP_URL_SCHEME ); 630 631 if ( 'http' === $scheme ) { 629 if ( isset( $request['reject_url'] ) ) { 630 $validated_reject_url = wp_is_authorize_application_redirect_url_valid( $request['reject_url'] ); 631 if ( is_wp_error( $validated_reject_url ) ) { 632 632 $error->add( 633 'invalid_redirect_scheme',634 __( 'The rejection url must be served over a secure connection.')633 , 634 ) 635 635 ); 636 636 } … … 661 661 return true; 662 662 } 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 -
branches/5.7/src/wp-includes/Requests/Hooks.php
r46586 r56886 66 66 return true; 67 67 } 68 69 70 71 68 72 } -
branches/5.7/src/wp-includes/Requests/IRI.php
r46586 r56886 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/5.7/src/wp-includes/Requests/Session.php
r46586 r56886 228 228 } 229 229 230 231 232 233 230 234 /** 231 235 * Merge a request's data with the default data -
branches/5.7/src/wp-includes/class-wp-block-patterns-registry.php
r50234 r56886 125 125 } 126 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 127 142 /** 128 143 * Utility method to retrieve the main instance of the class. -
branches/5.7/src/wp-includes/class-wp-block-type-registry.php
r50419 r56886 153 153 } 154 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 155 169 /** 156 170 * Utility method to retrieve the main instance of the class. -
branches/5.7/src/wp-includes/class-wp-theme.php
r49946 r56886 677 677 678 678 /** 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 679 701 * Adds theme data to cache. 680 702 * … … 1660 1682 return strnatcasecmp( $a->name_translated, $b->name_translated ); 1661 1683 } 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1662 1696 } -
branches/5.7/src/wp-includes/media.php
r55778 r56886 2339 2339 } 2340 2340 } elseif ( ! empty( $atts['exclude'] ) ) { 2341 2341 2342 $attachments = get_children( 2342 2343 array( … … 2351 2352 ); 2352 2353 } else { 2354 2353 2355 $attachments = get_children( 2354 2356 array( … … 2361 2363 ) 2362 2364 ); 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2363 2376 } 2364 2377 … … 2689 2702 } 2690 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2691 2713 if ( empty( $attachments ) ) { 2692 2714 return ''; -
branches/5.7/src/wp-includes/rest-api.php
r50656 r56886 1013 1013 1014 1014 if ( ! $result ) { 1015 1015 1016 return new WP_Error( 'rest_cookie_invalid_nonce', __( 'Cookie nonce is invalid' ), array( 'status' => 403 ) ); 1016 1017 } -
branches/5.7/src/wp-includes/rest-api/class-wp-rest-server.php
r50150 r56886 318 318 319 319 /** 320 * Filters whether to send nocache headers on a REST API request.321 *322 * @since 4.4.0323 *324 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.325 */326 $send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );327 if ( $send_no_cache_headers ) {328 foreach ( wp_get_nocache_headers() as $header => $header_value ) {329 if ( empty( $header_value ) ) {330 $this->remove_header( $header );331 } else {332 $this->send_header( $header, $header_value );333 }334 }335 }336 337 /**338 320 * Filters whether the REST API is enabled. 339 321 * … … 401 383 * header. 402 384 */ 385 403 386 if ( isset( $_GET['_method'] ) ) { 404 387 $request->set_method( $_GET['_method'] ); 405 388 } elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) { 406 389 $request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ); 390 407 391 } 408 392 … … 462 446 */ 463 447 $served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this ); 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 464 470 465 471 if ( ! $served ) { -
branches/5.7/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php
r49955 r56886 303 303 304 304 if ( ! empty( $prepared_args['search'] ) ) { 305 306 307 305 308 $prepared_args['search'] = '*' . $prepared_args['search'] . '*'; 306 309 } -
branches/5.7/src/wp-includes/shortcodes.php
r49963 r56886 161 161 162 162 /** 163 * Search content for shortcodes and filter shortcodes through their hooks. 163 * Returns a list of registered shortcode names found in the given content. 164 * 165 * Example usage: 166 * 167 * get_shortcode_tags_in_content( '[audio src="file.mp3"][/audio] [foo] [gallery ids="1,2,3"]' ); 168 * // array( 'audio', 'gallery' ) 169 * 170 * @since 6.3.2 171 * 172 * @param string $content The content to check. 173 * @return string[] An array of registered shortcode names found in the content. 174 */ 175 function get_shortcode_tags_in_content( $content ) { 176 if ( false === strpos( $content, '[' ) ) { 177 return array(); 178 } 179 180 preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); 181 if ( empty( $matches ) ) { 182 return array(); 183 } 184 185 $tags = array(); 186 foreach ( $matches as $shortcode ) { 187 $tags[] = $shortcode[2]; 188 189 if ( ! empty( $shortcode[5] ) ) { 190 $deep_tags = get_shortcode_tags_in_content( $shortcode[5] ); 191 if ( ! empty( $deep_tags ) ) { 192 $tags = array_merge( $tags, $deep_tags ); 193 } 194 } 195 } 196 197 return $tags; 198 } 199 200 /** 201 * Searches content for shortcodes and filter shortcodes through their hooks. 164 202 * 165 203 * This function is an alias for do_shortcode().
Note: See TracChangeset
for help on using the changeset viewer.