Changeset 47647
- Timestamp:
- 04/29/2020 04:13:02 PM (4 years ago)
- Location:
- branches/5.0
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.0
- Property svn:mergeinfo changed
/trunk merged: 47633-47638
- Property svn:mergeinfo changed
-
branches/5.0/src/wp-includes/cache.php
r41688 r47647 669 669 echo '<ul>'; 670 670 foreach ($this->cache as $group => $cache) { 671 echo "<li><strong>Group:</strong> $group - ( ". number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';671 echo . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>'; 672 672 } 673 673 echo '</ul>'; -
branches/5.0/src/wp-includes/class-wp-customize-manager.php
r44392 r47647 2860 2860 add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 ); 2861 2861 2862 // Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save(). 2863 $has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) ); 2864 if ( $has_kses ) { 2865 kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content. 2866 } 2867 2868 // Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values(). 2862 /* 2863 * Update the changeset post. The publish_customize_changeset action will cause the settings in the 2864 * changeset to be saved via WP_Customize_Setting::save(). Updating a post with publish status will 2865 * trigger WP_Customize_Manager::publish_changeset_values(). 2866 */ 2867 add_filter( 'wp_insert_post_data', array( $this, 'preserve_insert_changeset_post_content' ), 5, 3 ); 2869 2868 if ( $changeset_post_id ) { 2870 2869 if ( $args['autosave'] && 'auto-draft' !== get_post_status( $changeset_post_id ) ) { … … 2893 2892 } 2894 2893 } 2895 if ( $has_kses ) { 2896 kses_init_filters();2897 } 2894 2895 ); 2896 2898 2897 $this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents. 2899 2898 … … 2910 2909 2911 2910 return $response; 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2912 2956 } 2913 2957 -
branches/5.0/src/wp-includes/class-wp-query.php
r46492 r47647 760 760 } elseif ( $qv['p'] ) { 761 761 $this->is_single = true; 762 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {763 // If year, month, day, hour, minute, and second are set, a single764 // post is being queried.765 $this->is_single = true;766 762 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 767 763 $this->is_page = true; -
branches/5.0/src/wp-includes/formatting.php
r46915 r47647 1777 1777 $filename_raw = $filename; 1778 1778 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0)); 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1779 1797 /** 1780 1798 * Filters the list of characters to remove from a filename. … … 1786 1804 */ 1787 1805 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1788 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1789 1806 $filename = str_replace( $special_chars, '', $filename ); 1790 1807 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/5.0/src/wp-includes/post.php
r43849 r47647 3204 3204 global $wpdb; 3205 3205 3206 3207 3208 3206 3209 $user_id = get_current_user_id(); 3207 3210 … … 3507 3510 * 3508 3511 * @since 3.9.0 3512 3509 3513 * 3510 * @param array $data An array of sanitized attachment post data. 3511 * @param array $postarr An array of unsanitized attachment post data. 3514 * @param array $data An array of slashed, sanitized, and processed attachment post data. 3515 * @param array $postarr An array of slashed and sanitized attachment post data, but not processed. 3516 * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed attachment post data 3517 * as originally passed to wp_insert_post(). 3512 3518 */ 3513 $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr );3519 $data = apply_filters( 'wp_insert_attachment_data', $data, $postarr ); 3514 3520 } else { 3515 3521 /** … … 3517 3523 * 3518 3524 * @since 2.7.0 3525 3519 3526 * 3520 * @param array $data An array of slashed post data. 3521 * @param array $postarr An array of sanitized, but otherwise unmodified post data. 3527 * @param array $data An array of slashed, sanitized, and processed post data. 3528 * @param array $postarr An array of sanitized (and slashed) but otherwise unmodified post data. 3529 * @param array $unsanitized_postarr An array of slashed yet *unsanitized* and unprocessed post data as 3530 * originally passed to wp_insert_post(). 3522 3531 */ 3523 $data = apply_filters( 'wp_insert_post_data', $data, $postarr );3532 $data = apply_filters( 'wp_insert_post_data', $data, $postarr ); 3524 3533 } 3525 3534 $data = wp_unslash( $data ); -
branches/5.0/src/wp-includes/user.php
r43827 r47647 1701 1701 1702 1702 if ( $update ) { 1703 if ( $user_email !== $old_user_data->user_email ) {1703 if ( $user_email !== $old_user_data->user_email ) { 1704 1704 $data['user_activation_key'] = ''; 1705 1705 } -
branches/5.0/tests/phpunit/tests/customize/manager.php
r42620 r47647 1091 1091 1092 1092 /** 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1093 1258 * Call count for customize_changeset_save_data filter. 1094 1259 * -
branches/5.0/tests/phpunit/tests/formatting/SanitizeFileName.php
r37756 r47647 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/5.0/tests/phpunit/tests/user.php
r43459 r47647 918 918 } 919 919 920 function test_changing_email_invalidates_password_reset_key() {920 function test_changing_email_invalidates_password_reset_key() { 921 921 global $wpdb; 922 922 … … 943 943 'user_nicename' => 'cat', 944 944 'user_email' => 'foo@bar.dev', 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 945 965 ); 946 966 wp_update_user( $userdata );
Note: See TracChangeset
for help on using the changeset viewer.