Changeset 47656
- Timestamp:
- 04/29/2020 04:48:42 PM (4 years ago)
- Location:
- branches/4.3
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.3
- Property svn:mergeinfo changed
/trunk merged: 47634-47635,47637-47638
- Property svn:mergeinfo changed
-
branches/4.3/src/wp-includes/cache.php
r32539 r47656 654 654 echo '<ul>'; 655 655 foreach ($this->cache as $group => $cache) { 656 echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';656 echo , 2 ) . 'k )</li>'; 657 657 } 658 658 echo '</ul>'; -
branches/4.3/src/wp-includes/formatting.php
r37814 r47656 1310 1310 $filename_raw = $filename; 1311 1311 $special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0)); 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1312 1330 /** 1313 1331 * Filter the list of characters to remove from a filename. … … 1319 1337 */ 1320 1338 $special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw ); 1321 $filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );1322 1339 $filename = str_replace( $special_chars, '', $filename ); 1323 1340 $filename = str_replace( array( '%20', '+' ), '-', $filename ); -
branches/4.3/src/wp-includes/query.php
r46499 r47656 1600 1600 } elseif ( $qv['p'] ) { 1601 1601 $this->is_single = true; 1602 } elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {1603 // If year, month, day, hour, minute, and second are set, a single1604 // post is being queried.1605 $this->is_single = true;1606 1602 } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) { 1607 1603 $this->is_page = true; -
branches/4.3/src/wp-includes/user.php
r34118 r47656 2052 2052 2053 2053 if ( $update ) { 2054 if ( $user_email !== $old_user_data->user_email ) {2054 if ( $user_email !== $old_user_data->user_email ) { 2055 2055 $data['user_activation_key'] = ''; 2056 2056 } -
branches/4.3/tests/phpunit/tests/formatting/SanitizeFileName.php
r37814 r47656 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.3/tests/phpunit/tests/user.php
r34118 r47656 565 565 } 566 566 567 function test_changing_email_invalidates_password_reset_key() {567 function test_changing_email_invalidates_password_reset_key() { 568 568 global $wpdb; 569 569 … … 590 590 'user_nicename' => 'cat', 591 591 'user_email' => 'foo@bar.dev', 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 592 612 ); 593 613 wp_update_user( $userdata );
Note: See TracChangeset
for help on using the changeset viewer.