Changeset 47653
- Timestamp:
- 04/29/2020 04:38:31 PM (4 years ago)
- Location:
- branches/4.4
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.4
- Property svn:mergeinfo changed
/trunk merged: 47634-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/4.4/src/wp-includes/cache.php
r35325 r47653 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.4/src/wp-includes/formatting.php
r46001 r47653 1376 1376 $filename_raw = $filename; 1377 1377 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0)); 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1378 1396 /** 1379 1397 * Filter the list of characters to remove from a filename. … … 1385 1403 */ 1386 1404 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1387 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1388 1405 $filename = str_replace( $special_chars, '', $filename ); 1389 1406 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/4.4/src/wp-includes/query.php
r46498 r47653 1664 1664 } elseif ( $qv['p'] ) { 1665 1665 $this->is_single = true; 1666 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {1667 // If year, month, day, hour, minute, and second are set, a single1668 // post is being queried.1669 $this->is_single = true;1670 1666 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 1671 1667 $this->is_page = true; -
branches/4.4/src/wp-includes/user.php
r41129 r47653 1498 1498 1499 1499 if ( $update ) { 1500 if ( $user_email !== $old_user_data->user_email ) {1500 if ( $user_email !== $old_user_data->user_email ) { 1501 1501 $data['user_activation_key'] = ''; 1502 1502 } -
branches/4.4/tests/phpunit/tests/formatting/SanitizeFileName.php
r37810 r47653 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.4/tests/phpunit/tests/user.php
r35772 r47653 903 903 } 904 904 905 function test_changing_email_invalidates_password_reset_key() {905 function test_changing_email_invalidates_password_reset_key() { 906 906 global $wpdb; 907 907 … … 928 928 'user_nicename' => 'cat', 929 929 'user_email' => 'foo@bar.dev', 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 930 950 ); 931 951 wp_update_user( $userdata );
Note: See TracChangeset
for help on using the changeset viewer.