Changeset 47650
- Timestamp:
- 04/29/2020 04:22:22 PM (4 years ago)
- Location:
- branches/4.7
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.7
- Property svn:mergeinfo changed
/trunk merged: 47633-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/4.7/src/wp-includes/cache.php
r39051 r47650 692 692 echo '<ul>'; 693 693 foreach ($this->cache as $group => $cache) { 694 echo "<li><strong>Group:</strong> $group - ( ". number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';694 echo . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>'; 695 695 } 696 696 echo '</ul>'; -
branches/4.7/src/wp-includes/class-wp-customize-manager.php
r41430 r47650 2526 2526 add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 ); 2527 2527 2528 // Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save(). 2529 $has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) ); 2530 if ( $has_kses ) { 2531 kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content. 2532 } 2533 2534 // Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values(). 2528 /* 2529 * Update the changeset post. The publish_customize_changeset action will cause the settings in the 2530 * changeset to be saved via WP_Customize_Setting::save(). Updating a post with publish status will 2531 * trigger WP_Customize_Manager::publish_changeset_values(). 2532 */ 2533 add_filter( 'wp_insert_post_data', array( $this, 'preserve_insert_changeset_post_content' ), 5, 3 ); 2535 2534 if ( $changeset_post_id ) { 2536 2535 $post_array['edit_date'] = true; // Prevent date clearing. … … 2542 2541 } 2543 2542 } 2544 if ( $has_kses ) { 2545 kses_init_filters();2546 } 2543 2544 ); 2545 2547 2546 $this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents. 2548 2547 … … 2559 2558 2560 2559 return $response; 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2561 2605 } 2562 2606 -
branches/4.7/src/wp-includes/class-wp-query.php
r46495 r47650 807 807 } elseif ( $qv['p'] ) { 808 808 $this->is_single = true; 809 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {810 // If year, month, day, hour, minute, and second are set, a single811 // post is being queried.812 $this->is_single = true;813 809 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 814 810 $this->is_page = true; -
branches/4.7/src/wp-includes/formatting.php
r45996 r47650 1762 1762 $filename_raw = $filename; 1763 1763 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0)); 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1764 1782 /** 1765 1783 * Filters the list of characters to remove from a filename. … … 1771 1789 */ 1772 1790 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1773 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1774 1791 $filename = str_replace( $special_chars, '', $filename ); 1775 1792 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/4.7/src/wp-includes/post.php
r43395 r47650 2969 2969 global $wpdb; 2970 2970 2971 2972 2973 2971 2974 $user_id = get_current_user_id(); 2972 2975 … … 3265 3268 * 3266 3269 * @since 3.9.0 3270 3267 3271 * 3268 * @param array $data An array of sanitized attachment post data. 3269 * @param array $postarr An array of unsanitized attachment post data. 3272 * @param array $data An array of slashed, sanitized, and processed attachment post data. 3273 * @param array $postarr An array of slashed and sanitized attachment post data, but not processed. 3274 * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed attachment post data 3275 * as originally passed to wp_insert_post(). 3270 3276 */ 3271 $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr );3277 $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr ); 3272 3278 } else { 3273 3279 /** … … 3275 3281 * 3276 3282 * @since 2.7.0 3283 3277 3284 * 3278 * @param array $data An array of slashed post data. 3279 * @param array $postarr An array of sanitized, but otherwise unmodified post data. 3285 * @param array $data An array of slashed, sanitized, and processed post data. 3286 * @param array $postarr An array of sanitized (and slashed) but otherwise unmodified post data. 3287 * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed post data as 3288 * originally passed to wp_insert_post(). 3280 3289 */ 3281 $data = apply_filters( 'wp_insert_post_data', $data, $postarr );3290 $data = apply_filters( 'wp_insert_post_data', $data, $postarr ); 3282 3291 } 3283 3292 $data = wp_unslash( $data ); -
branches/4.7/src/wp-includes/user.php
r39326 r47650 1629 1629 1630 1630 if ( $update ) { 1631 if ( $user_email !== $old_user_data->user_email ) {1631 if ( $user_email !== $old_user_data->user_email ) { 1632 1632 $data['user_activation_key'] = ''; 1633 1633 } -
branches/4.7/tests/phpunit/tests/customize/manager.php
r40338 r47650 887 887 888 888 /** 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 889 1039 * Call count for customize_changeset_save_data filter. 890 1040 * -
branches/4.7/tests/phpunit/tests/formatting/SanitizeFileName.php
r37756 r47650 68 68 $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) ); 69 69 } 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 70 86 } -
branches/4.7/tests/phpunit/tests/user.php
r38768 r47650 919 919 } 920 920 921 function test_changing_email_invalidates_password_reset_key() {921 function test_changing_email_invalidates_password_reset_key() { 922 922 global $wpdb; 923 923 … … 944 944 'user_nicename' => 'cat', 945 945 'user_email' => 'foo@bar.dev', 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 946 966 ); 947 967 wp_update_user( $userdata );
Note: See TracChangeset
for help on using the changeset viewer.