Skip to content

Commit b67c51b

Browse files
mitchmacmitchmac
committed
Automated WordPress version update
1 parent b62c754 commit b67c51b

122 files changed

Lines changed: 21643 additions & 2172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎wp/wp-admin/about.php‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,32 @@
5656

5757
<div class="about__section changelog has-subtle-background-color">
5858
<div class="column">
59-
<h2><?php _e( 'Maintenance and Security Release' ); ?></h2>
59+
<h2><?php _e( 'Maintenance and Security Releases' ); ?></h2>
60+
<p>
61+
<?php
62+
printf(
63+
/* translators: 1: WordPress version number, 2: Plural number of bugs. */
64+
_n(
65+
'<strong>Version %1$s</strong> addressed %2$s bug.',
66+
'<strong>Version %1$s</strong> addressed %2$s bugs.',
67+
35
68+
),
69+
'6.8.2',
70+
'35'
71+
);
72+
?>
73+
<?php
74+
printf(
75+
/* translators: %s: HelpHub URL. */
76+
__( 'For more information, see <a href="%s">the release notes</a>.' ),
77+
sprintf(
78+
/* translators: %s: WordPress version. */
79+
esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
80+
sanitize_title( '6.8.2' )
81+
)
82+
);
83+
?>
84+
</p>
6085
<p>
6186
<?php
6287
printf(

‎wp/wp-admin/css/revisions-rtl.css‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,28 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
573573
}
574574
}
575575

576+
@media screen and (max-width: 600px) {
577+
.revisions-meta .author-card:not(.comparing-two-revisions .author-card) {
578+
display: flex;
579+
flex-direction: column;
580+
width: fit-content;
581+
gap: 16px;
582+
}
583+
584+
.comparing-two-revisions .revisions-meta .restore-revision {
585+
margin-top: 16px;
586+
}
587+
588+
.revisions-controls {
589+
padding-top: 0;
590+
}
591+
592+
.revision-toggle-compare-mode {
593+
position: relative;
594+
padding: 1rem 0;
595+
}
596+
}
597+
576598
@media screen and (max-width: 782px) {
577599
#diff-next-revision,
578600
#diff-previous-revision {
@@ -586,14 +608,18 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
586608

587609
.revisions-controls,
588610
.comparing-two-revisions .revisions-controls {
589-
height: 170px;
611+
height: fit-content;
590612
}
591613

592614
.revisions-tooltip {
593-
bottom: 130px;
615+
bottom: 155px;
594616
z-index: 2;
595617
}
596618

619+
.comparing-two-revisions .revisions-tooltip {
620+
bottom: 200px;
621+
}
622+
597623
.diff-meta {
598624
overflow: hidden;
599625
}

‎wp/wp-admin/css/revisions-rtl.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp/wp-admin/css/revisions.css‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,28 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
572572
}
573573
}
574574

575+
@media screen and (max-width: 600px) {
576+
.revisions-meta .author-card:not(.comparing-two-revisions .author-card) {
577+
display: flex;
578+
flex-direction: column;
579+
width: fit-content;
580+
gap: 16px;
581+
}
582+
583+
.comparing-two-revisions .revisions-meta .restore-revision {
584+
margin-top: 16px;
585+
}
586+
587+
.revisions-controls {
588+
padding-top: 0;
589+
}
590+
591+
.revision-toggle-compare-mode {
592+
position: relative;
593+
padding: 1rem 0;
594+
}
595+
}
596+
575597
@media screen and (max-width: 782px) {
576598
#diff-next-revision,
577599
#diff-previous-revision {
@@ -585,14 +607,18 @@ div.revisions-controls > .wp-slider > .ui-slider-handle {
585607

586608
.revisions-controls,
587609
.comparing-two-revisions .revisions-controls {
588-
height: 170px;
610+
height: fit-content;
589611
}
590612

591613
.revisions-tooltip {
592-
bottom: 130px;
614+
bottom: 155px;
593615
z-index: 2;
594616
}
595617

618+
.comparing-two-revisions .revisions-tooltip {
619+
bottom: 200px;
620+
}
621+
596622
.diff-meta {
597623
overflow: hidden;
598624
}

‎wp/wp-admin/css/revisions.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp/wp-admin/includes/revision.php‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -407,41 +407,43 @@ function wp_print_revision_templates() {
407407
<strong id="diff-title-to"><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
408408
<# } #>
409409
<div class="author-card<# if ( data.attributes.autosave ) { #> autosave<# } #>">
410-
{{{ data.attributes.author.avatar }}}
411-
<div class="author-info" id="diff-title-author">
412-
<# if ( data.attributes.autosave ) { #>
413-
<span class="byline">
414-
<?php
415-
printf(
416-
/* translators: %s: User's display name. */
417-
__( 'Autosave by %s' ),
418-
'<span class="author-name">{{ data.attributes.author.name }}</span>'
419-
);
420-
?>
421-
</span>
422-
<# } else if ( data.attributes.current ) { #>
423-
<span class="byline">
424-
<?php
425-
printf(
426-
/* translators: %s: User's display name. */
427-
__( 'Current Revision by %s' ),
428-
'<span class="author-name">{{ data.attributes.author.name }}</span>'
429-
);
430-
?>
431-
</span>
432-
<# } else { #>
433-
<span class="byline">
434-
<?php
435-
printf(
436-
/* translators: %s: User's display name. */
437-
__( 'Revision by %s' ),
438-
'<span class="author-name">{{ data.attributes.author.name }}</span>'
439-
);
440-
?>
441-
</span>
442-
<# } #>
443-
<span class="time-ago">{{ data.attributes.timeAgo }}</span>
444-
<span class="date">({{ data.attributes.dateShort }})</span>
410+
<div>
411+
{{{ data.attributes.author.avatar }}}
412+
<div class="author-info" id="diff-title-author">
413+
<# if ( data.attributes.autosave ) { #>
414+
<span class="byline">
415+
<?php
416+
printf(
417+
/* translators: %s: User's display name. */
418+
__( 'Autosave by %s' ),
419+
'<span class="author-name">{{ data.attributes.author.name }}</span>'
420+
);
421+
?>
422+
</span>
423+
<# } else if ( data.attributes.current ) { #>
424+
<span class="byline">
425+
<?php
426+
printf(
427+
/* translators: %s: User's display name. */
428+
__( 'Current Revision by %s' ),
429+
'<span class="author-name">{{ data.attributes.author.name }}</span>'
430+
);
431+
?>
432+
</span>
433+
<# } else { #>
434+
<span class="byline">
435+
<?php
436+
printf(
437+
/* translators: %s: User's display name. */
438+
__( 'Revision by %s' ),
439+
'<span class="author-name">{{ data.attributes.author.name }}</span>'
440+
);
441+
?>
442+
</span>
443+
<# } #>
444+
<span class="time-ago">{{ data.attributes.timeAgo }}</span>
445+
<span class="date">({{ data.attributes.dateShort }})</span>
446+
</div>
445447
</div>
446448
<# if ( 'to' === data.type && data.attributes.restoreUrl ) { #>
447449
<input <?php if ( wp_check_post_lock( $post->ID ) ) { ?>

‎wp/wp-admin/includes/schema.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ function populate_options( array $options = array() ) {
446446
'moderation_keys' => '',
447447
'active_plugins' => array(),
448448
'category_base' => '',
449-
'ping_sites' => 'http://rpc.pingomatic.com/',
449+
'ping_sites' => 'https://rpc.pingomatic.com/',
450450
'comment_max_links' => 2,
451451
'gmt_offset' => $gmt_offset,
452452

‎wp/wp-admin/includes/upgrade.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,11 @@ function upgrade_all() {
881881
if ( $wp_current_db_version < 58975 ) {
882882
upgrade_670();
883883
}
884+
885+
if ( $wp_current_db_version < 60421 ) {
886+
upgrade_682();
887+
}
888+
884889
maybe_disable_link_manager();
885890

886891
maybe_disable_automattic_widgets();
@@ -2439,6 +2444,42 @@ function upgrade_670() {
24392444
wp_set_options_autoload( $options, false );
24402445
}
24412446
}
2447+
2448+
/**
2449+
* Executes changes made in WordPress 6.8.2.
2450+
*
2451+
* @ignore
2452+
* @since 6.8.2
2453+
*
2454+
* @global int $wp_current_db_version The old (current) database version.
2455+
*/
2456+
function upgrade_682() {
2457+
global $wp_current_db_version;
2458+
2459+
if ( $wp_current_db_version < 60421 ) {
2460+
// Upgrade Ping-O-Matic and Twingly to use HTTPS.
2461+
$ping_sites_value = get_option( 'ping_sites' );
2462+
$ping_sites_value = explode( "\n", $ping_sites_value );
2463+
$ping_sites_value = array_map(
2464+
function ( $url ) {
2465+
$url = trim( $url );
2466+
$url = sanitize_url( $url );
2467+
if (
2468+
str_ends_with( trailingslashit( $url ), '://rpc.pingomatic.com/' )
2469+
|| str_ends_with( trailingslashit( $url ), '://rpc.twingly.com/' )
2470+
) {
2471+
$url = set_url_scheme( $url, 'https' );
2472+
}
2473+
return $url;
2474+
},
2475+
$ping_sites_value
2476+
);
2477+
$ping_sites_value = array_filter( $ping_sites_value );
2478+
$ping_sites_value = implode( "\n", $ping_sites_value );
2479+
update_option( 'ping_sites', $ping_sites_value );
2480+
}
2481+
}
2482+
24422483
/**
24432484
* Executes network-level upgrade routines.
24442485
*

‎wp/wp-content/plugins/sqlite-database-integration/.gitattributes‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
composer.json export-ignore
66
phpcs.xml.dist export-ignore
77
phpunit.xml.dist export-ignore
8+
wp-setup.sh export-ignore
89
/.github export-ignore
910
/grammar-tools export-ignore
1011
/tests export-ignore
11-
/wip export-ignore
12-
/wp-includes/mysql export-ignore
13-
/wp-includes/parser export-ignore
1412
/wp-includes/sqlite/class-wp-sqlite-crosscheck-db.php export-ignore
13+
/wordpress export-ignore

‎wp/wp-content/plugins/sqlite-database-integration/.github/workflows/end-to-end-tests.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: End-to-end Tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
jobs:
10+
test:
11+
name: End-to-end Tests
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 20
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v3
21+
22+
- name: Set UID and GID for PHP in WordPress images
23+
run: |
24+
echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
25+
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
26+
27+
- name: Install Playwright browsers
28+
run: npx playwright install --with-deps
29+
30+
- name: Run end-to-end tests
31+
run: composer run test-e2e
32+
33+
- name: Stop Docker containers
34+
if: always()
35+
run: composer run wp-test-clean

0 commit comments

Comments
 (0)