Changeset 47661
- Timestamp:
- 04/29/2020 04:57:01 PM (4 years ago)
- Location:
- branches/3.8
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.8
- Property svn:mergeinfo changed
/trunk merged: 47634-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/3.8/src/wp-includes/cache.php
r25451 r47661 589 589 echo '<ul>'; 590 590 foreach ($this->cache as $group => $cache) { 591 echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';591 echo , 2 ) . 'k )</li>'; 592 592 } 593 593 echo '</ul>'; -
branches/3.8/src/wp-includes/formatting.php
r37824 r47661 978 978 $filename_raw = $filename; 979 979 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0)); 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 980 998 /** 981 999 * Filter the list of characters to remove from a filename. -
branches/3.8/src/wp-includes/query.php
r46504 r47661 1500 1500 } elseif ( $qv['p'] ) { 1501 1501 $this->is_single = true; 1502 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {1503 // If year, month, day, hour, minute, and second are set, a single1504 // post is being queried.1505 $this->is_single = true;1506 1502 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 1507 1503 $this->is_page = true; -
branches/3.8/src/wp-includes/user.php
r30433 r47661 1410 1410 1411 1411 if ( $update ) { 1412 if ( $user_email !== $old_user_data->user_email ) {1412 if ( $user_email !== $old_user_data->user_email ) { 1413 1413 $data['user_activation_key'] = ''; 1414 1414 } -
branches/3.8/tests/phpunit/tests/formatting/SanitizeFileName.php
r37824 r47661 43 43 $this->assertEquals( 'no-extension', sanitize_file_name( '_.no-extension' ) ); 44 44 } 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 45 61 } -
branches/3.8/tests/phpunit/tests/user.php
r47338 r47661 589 589 } 590 590 591 function test_changing_email_invalidates_password_reset_key() {591 function test_changing_email_invalidates_password_reset_key() { 592 592 global $wpdb; 593 593 … … 620 620 $this->assertEmpty( $user->user_activation_key ); 621 621 } 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 622 643 }
Note: See TracChangeset
for help on using the changeset viewer.