Changeset 47651
- Timestamp:
- 04/29/2020 04:24:40 PM (4 years ago)
- Location:
- branches/4.6
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.6
- Property svn:mergeinfo changed
/trunk merged: 47634-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/4.6/src/wp-includes/formatting.php
r45998 r47651 1745 1745 $filename_raw = $filename; 1746 1746 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0)); 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1747 1765 /** 1748 1766 * Filters the list of characters to remove from a filename. … … 1754 1772 */ 1755 1773 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1756 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1757 1774 $filename = str_replace( $special_chars, '', $filename ); 1758 1775 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/4.6/src/wp-includes/query.php
r46496 r47651 1633 1633 } elseif ( $qv['p'] ) { 1634 1634 $this->is_single = true; 1635 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {1636 // If year, month, day, hour, minute, and second are set, a single1637 // post is being queried.1638 $this->is_single = true;1639 1635 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 1640 1636 $this->is_page = true; -
branches/4.6/src/wp-includes/user.php
r38125 r47651 1613 1613 1614 1614 if ( $update ) { 1615 if ( $user_email !== $old_user_data->user_email ) {1615 if ( $user_email !== $old_user_data->user_email ) { 1616 1616 $data['user_activation_key'] = ''; 1617 1617 } -
branches/4.6/tests/phpunit/tests/formatting/SanitizeFileName.php
r37756 r47651 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.6/tests/phpunit/tests/user.php
r38005 r47651 925 925 } 926 926 927 function test_changing_email_invalidates_password_reset_key() {927 function test_changing_email_invalidates_password_reset_key() { 928 928 global $wpdb; 929 929 … … 950 950 'user_nicename' => 'cat', 951 951 'user_email' => 'foo@bar.dev', 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 952 972 ); 953 973 wp_update_user( $userdata );
Note: See TracChangeset
for help on using the changeset viewer.