Changeset 47657
- Timestamp:
- 04/29/2020 04:51:02 PM (4 years ago)
- Location:
- branches/4.2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.2
- Property svn:mergeinfo changed
/trunk merged: 47634-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/4.2/src/wp-includes/cache.php
r32116 r47657 648 648 echo '<ul>'; 649 649 foreach ($this->cache as $group => $cache) { 650 echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';650 echo , 2 ) . 'k )</li>'; 651 651 } 652 652 echo '</ul>'; -
branches/4.2/src/wp-includes/formatting.php
r37816 r47657 1220 1220 $filename_raw = $filename; 1221 1221 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0)); 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1222 1240 /** 1223 1241 * Filter the list of characters to remove from a filename. … … 1229 1247 */ 1230 1248 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1231 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1232 1249 $filename = str_replace( $special_chars, '', $filename ); 1233 1250 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/4.2/src/wp-includes/query.php
r46500 r47657 1601 1601 } elseif ( $qv['p'] ) { 1602 1602 $this->is_single = true; 1603 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {1604 // If year, month, day, hour, minute, and second are set, a single1605 // post is being queried.1606 $this->is_single = true;1607 1603 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 1608 1604 $this->is_page = true; -
branches/4.2/src/wp-includes/user.php
r32207 r47657 2005 2005 2006 2006 if ( $update ) { 2007 if ( $user_email !== $old_user_data->user_email ) {2007 if ( $user_email !== $old_user_data->user_email ) { 2008 2008 $data['user_activation_key'] = ''; 2009 2009 } -
branches/4.2/tests/phpunit/tests/formatting/SanitizeFileName.php
r37816 r47657 61 61 $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) ); 62 62 } 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 63 79 } -
branches/4.2/tests/phpunit/tests/user.php
r31963 r47657 669 669 } 670 670 671 function test_changing_email_invalidates_password_reset_key() {671 function test_changing_email_invalidates_password_reset_key() { 672 672 global $wpdb; 673 673 … … 700 700 $this->assertEmpty( $user->user_activation_key ); 701 701 } 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 702 723 }
Note: See TracChangeset
for help on using the changeset viewer.