Collaboration/single table

.github/workflows/test-old-branches.yml

@@ -25,7 +25,7 @@ on:
 permissions: {}
 
 env:
-  CURRENTLY_SUPPORTED_BRANCH: '6.9'
+  CURRENTLY_SUPPORTED_BRANCH: '7.0'
 
 jobs:
   dispatch-workflows-for-old-branches:
@@ -45,12 +45,15 @@ jobs:
             'test-build-processes.yml'
         ]
         branch: [
+            '7.0',
             '6.9', '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2', '6.1','6.0',
             '5.9', '5.8', '5.7', '5.6', '5.5', '5.4', '5.3', '5.2', '5.1', '5.0',
             '4.9', '4.8', '4.7'
         ]
         include:
           # PHP Compatibility testing was introduced in 5.5.
+          - branch: '7.0'
+            workflow: 'php-compatibility.yml'
           - branch: '6.9'
             workflow: 'php-compatibility.yml'
           - branch: '6.8'
@@ -85,6 +88,8 @@ jobs:
           # End-to-end testing was introduced in 5.3 but was later removed as there were no meaningful assertions.
           # Starting in 5.8 with #52905, some additional tests with real assertions were introduced.
           # Branches 5.8 and newer should be tested to confirm no regressions are introduced.
+          - branch: '7.0'
+            workflow: 'end-to-end-tests.yml'
           - branch: '6.9'
             workflow: 'end-to-end-tests.yml'
           - branch: '6.8'
@@ -113,9 +118,9 @@ jobs:
           # Performance testing was introduced in 6.2 using Puppeteer but was overhauled to use Playwright instead in 6.4.
           # Since the workflow frequently failed for 6.2 and 6.3 due to the flaky nature of the Puppeteer tests,
           # the workflow was removed from those two branches.
-          - branch: '6.9'
+          - branch: '7.0'
             workflow: 'performance.yml'
-          - branch: '6.8'
+          - branch: '6.9'
             workflow: 'performance.yml'
 
     # Run all branches monthly, but only the currently supported one twice per month.

.github/workflows/upgrade-develop-testing.yml

@@ -75,7 +75,7 @@ jobs:
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.4' ]
         # WordPress 5.3 is the oldest version that supports PHP 7.4.
-        wp: [ '5.3', '6.8', '6.9' ]
+        wp: [ '5.3', '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}
@@ -101,7 +101,7 @@ jobs:
         php: [ '7.4', '8.4' ]
         db-type: [ 'mysql' ]
         db-version: [ '8.4' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

.github/workflows/upgrade-testing.yml

@@ -71,7 +71,7 @@ jobs:
         php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
         db-type: [ 'mysql' ]
         db-version: [ '5.7', '8.0', '8.4', '9.6' ]
-        wp: [ '6.8', '6.9' ]
+        wp: [ '6.8', '6.9', '7.0-RC2' ]
         multisite: [ false, true ]
     with:
       os: ${{ matrix.os }}

.version-support-mysql.json

@@ -1,4 +1,18 @@
 {
+	"7-1": [
+		"9.6",
+		"9.5",
+		"9.4",
+		"9.3",
+		"9.2",
+		"9.1",
+		"9.0",
+		"8.4",
+		"8.0",
+		"5.7",
+		"5.6",
+		"5.5"
+	],
 	"7-0": [
 		"9.6",
 		"9.5",

.version-support-php.json

@@ -1,4 +1,13 @@
 {
+	"7-1": [
+		"7.4",
+		"8.0",
+		"8.1",
+		"8.2",
+		"8.3",
+		"8.4",
+		"8.5"
+	],
 	"7-0": [
 		"7.4",
 		"8.0",

Gruntfile.js

@@ -1837,6 +1837,7 @@ module.exports = function(grunt) {
 		'clean:js',
 		'build:webpack',
 		'copy:js',
+		'copy-vendor-scripts',
 		'file_append',
 		'uglify:all',
 		'concat:tinymce',
@@ -2133,7 +2134,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'build:certificates'
 			] );
 		} else {
@@ -2145,7 +2145,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'replace:source-maps',
 				'verify:build'
 			] );

SECURITY.md

@@ -10,6 +10,7 @@ Full details of the WordPress Security Policy and the list of covered projects a
 
 | Version | Supported |
 |---------| --------- |
+| 7.0.x   | Yes       |
 | 6.9.x   | Yes       |
 | 6.8.x   | Yes       |
 | 6.7.x   | Yes       |

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "wordpress/wordpress",
-	"version": "7.0.0",
+	"version": "7.1.0",
 	"license": "GPL-2.0-or-later",
 	"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
 	"homepage": "https://wordpress.org",

package.json

@@ -1,13 +1,13 @@
 {
 	"name": "WordPress",
-	"version": "7.0.0",
+	"version": "7.1.0",
 	"description": "WordPress is open source software you can use to create a beautiful website, blog, or app.",
 	"repository": {
 		"type": "svn",
 		"url": "https://develop.svn.wordpress.org/trunk"
 	},
 	"gutenberg": {
-		"sha": "0d133bf7e7437d65d68a06551f3d613a7d8e4361",
+		"sha": "e2970ba736edb99e08fb369d4fb0c378189468ee",
 		"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
 	},
 	"engines": {

src/wp-admin/admin.php

@@ -113,6 +113,14 @@
 	wp_schedule_event( time(), 'daily', 'delete_expired_transients' );
 }
 
+// Schedule collaboration data cleanup.
+if ( wp_is_collaboration_enabled()
+	&& ! wp_next_scheduled( 'wp_delete_old_collaboration_data' )
+	&& ! wp_installing()
+) {
+	wp_schedule_event( time(), 'daily', 'wp_delete_old_collaboration_data' );
+}
+
 set_screen_options();
 
 $date_format = __( 'F j, Y' );

src/wp-admin/css/color-picker.css

@@ -10,7 +10,7 @@
 
 /* Needs higher specificity to override `.wp-core-ui .button`. */
 .wp-picker-container .wp-color-result.button {
-	min-height: 30px;
+	min-height: 32px;
 	margin: 0 6px 6px 0;
 	padding: 0 0 0 30px;
 	font-size: 11px;
@@ -22,7 +22,7 @@
 	border-left: 1px solid #c3c4c7;
 	color: #50575e;
 	display: block;
-	line-height: 2.54545455; /* 28px */
+	line-height: 2.72727273; /* 30px */
 	padding: 0 6px;
 	text-align: center;
 }
@@ -76,8 +76,8 @@
 .wp-customizer .wp-picker-input-wrap .button.wp-picker-clear {
 	margin-left: 6px;
 	padding: 0 8px;
-	line-height: 2.54545455; /* 28px */
-	min-height: 30px;
+	line-height: 2.72727273; /* 30px */
+	min-height: 32px;
 }
 
 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -94,11 +94,10 @@
 	width: 4rem;
 	font-size: 12px;
 	font-family: monospace;
-	line-height: 2.33333333; /* 28px */
 	margin: 0;
 	padding: 0 5px;
 	vertical-align: top;
-	min-height: 30px;
+	min-height: 32px;
 }
 
 .wp-color-picker::-webkit-input-placeholder {

src/wp-admin/css/common.css

@@ -1115,7 +1115,6 @@ th.action-links {
 
 .wp-filter .search-form input[type="search"] {
 	min-height: 32px;
-	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding: 0 8px;
 }
 
@@ -1474,22 +1473,22 @@ div.error p,
 	color: #1e1e1e;
 }
 
-.notice a,
-.error a,
-.updated a {
+div.notice a,
+div.error a,
+div.updated a {
 	color: var(--wp-admin-theme-color-darker-10);
 	text-decoration: underline;
 }
 
-.notice a:hover,
-.error a:hover,
-.updated a:hover {
+div.notice a:hover,
+div.error a:hover,
+div.updated a:hover {
 	color: var(--wp-admin-theme-color-darker-20);
 }
 
-.notice a:focus,
-.error a:focus,
-.updated a:focus {
+div.notice a:focus,
+div.error a:focus,
+div.updated a:focus {
 	box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 	outline: 2px solid transparent;
 	border-radius: 2px;
@@ -2078,17 +2077,6 @@ p.auto-update-status {
 	box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02), 0 1px 0 rgba(0, 0, 0, 0.02);
 }
 
-.contextual-help-tabs .active::after {
-	content: "";
-	position: absolute;
-	top: 0;
-	right: -1px;
-	width: 2px;
-	height: 100%;
-	background: inherit;
-	z-index: 2;
-}
-
 .contextual-help-tabs .active a {
 	border-color: #c3c4c7;
 	color: #2c3338;
@@ -2293,7 +2281,7 @@ html.wp-toolbar {
 	line-height: 1;
 }
 
-.postbox.closed {
+.postbox.closed .postbox-header {
 	border-bottom: 0;
 }
 
@@ -3352,7 +3340,7 @@ img {
 .postbox .handle-order-higher:focus,
 .postbox .handle-order-lower:focus,
 .postbox .handlediv:focus {
-	box-shadow: 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color);
+	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus, 1.5px) var(--wp-admin-theme-color);
 	border-radius: 50%;
 	/* Only visible in Windows High Contrast mode */
 	outline: 2px solid transparent;

src/wp-admin/css/customize-controls.css

@@ -2184,7 +2184,6 @@ p.customize-section-description {
 }
 
 .themes-filter-bar .wp-filter-search {
-	line-height: 2.14285714; /* 30px for 32px compact input */
 	padding: 0 10px 0 30px;
 	max-width: 100%;
 	width: 40%;

src/wp-admin/css/dashboard.css

@@ -533,7 +533,6 @@
 	width: 40%;
 	margin: 0;
 	min-height: 32px;
-	line-height: 2.14285714;
 	padding: 0 8px;
 }
 

src/wp-admin/css/edit.css

@@ -994,15 +994,16 @@ form#tags-filter {
 }
 
 .privacy-settings-accordion-actions {
-	text-align: right;
-	display: block;
+	justify-content: right;
+	display: flex;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 1em;
 }
 
 .privacy-settings-accordion-actions .success {
 	display: none;
 	color: #007017;
-	padding-right: 1em;
-	padding-top: 6px;
 }
 
 .privacy-settings-accordion-actions .success.visible {

src/wp-admin/css/forms.css

@@ -69,7 +69,6 @@ input[type="url"],
 input[type="week"] {
 	padding: 0 12px;
 	/* inherits font size 14px */
-	line-height: 2.71428571; /* 38px for 40px min-height */
 	min-height: 40px;
 }
 
@@ -816,7 +815,6 @@ p.search-box {
 p.search-box input[type="search"],
 p.search-box input[type="text"] {
 	min-height: 32px;
-	line-height: 2.14285714; /* 30px for 32px height with 14px font */
 	padding: 0 8px;
 }
 
@@ -1237,8 +1235,7 @@ table.form-table td .updated p {
 .options-general-php input.small-text {
 	width: 56px;
 	margin: -2px 0;
-	min-height: 24px;
-	line-height: 1.71428571; /* 24px for 14px font size */
+	min-height: 32px;
 }
 
 .options-general-php .spinner {
@@ -1601,7 +1598,6 @@ table.form-table td .updated p {
 		-webkit-appearance: none;
 		padding: 0 12px;
 		min-height: 40px;
-		line-height: 2.5; /* 40px for 16px font */
 	}
 
 	::-webkit-datetime-edit {