Tag 4.9.1

Built from https://develop.svn.wordpress.org/tags/4.9.1@42329


git-svn-id: http://core.svn.wordpress.org/tags/4.9.1@42158 1a063a9b-81f0-0310-95a4-ce76da25c4cd

license.txt

@@ -1,6 +1,6 @@
 WordPress - Web publishing software
 
-Copyright 2011-2018 by the contributors
+Copyright 2011-2017 by the contributors
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

readme.html

@@ -58,7 +58,7 @@
 
 <h3>Recommendations</h3>
 <ul>
-	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.2</strong> or higher.</li>
+	<li><a href="https://secure.php.net/">PHP</a> version <strong>7</strong> or higher.</li>
 	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.6</strong> or higher.</li>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>

wp-activate.php

@@ -18,52 +18,6 @@ if ( !is_multisite() ) {
 	die();
 }
 
-$valid_error_codes = array( 'already_active', 'blog_taken' );
-
-list( $activate_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-$activate_cookie = 'wp-activate-' . COOKIEHASH;
-
-$key    = '';
-$result = null;
-
-if ( isset( $_GET['key'] ) && isset( $_POST['key'] ) && $_GET['key'] !== $_POST['key'] ) {
-	wp_die( __( 'A key value mismatch has been detected. Please follow the link provided in your activation email.' ), __( 'An error occurred during the activation' ), 400 );
-} elseif ( ! empty( $_GET['key'] ) ) {
-	$key = $_GET['key'];
-} elseif ( ! empty( $_POST['key'] ) ) {
-	$key = $_POST['key'];
-}
-
-if ( $key ) {
-	$redirect_url = remove_query_arg( 'key' );
-
-	if ( $redirect_url !== remove_query_arg( false ) ) {
-		setcookie( $activate_cookie, $key, 0, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
-		wp_safe_redirect( $redirect_url );
-		exit;
-	} else {
-		$result = wpmu_activate_signup( $key );
-	}
-}
-
-if ( $result === null && isset( $_COOKIE[ $activate_cookie ] ) ) {
-	$key    = $_COOKIE[ $activate_cookie ];
-	$result = wpmu_activate_signup( $key );
-	setcookie( $activate_cookie, ' ', time() - YEAR_IN_SECONDS, $activate_path, COOKIE_DOMAIN, is_ssl(), true );
-}
-
-if ( $result === null || ( is_wp_error( $result ) && 'invalid_key' === $result->get_error_code() ) ) {
-	status_header( 404 );
-} elseif ( is_wp_error( $result ) ) {
-	$error_code = $result->get_error_code();
-
-	if ( ! in_array( $error_code, $valid_error_codes ) ) {
-		status_header( 400 );
-	}
-}
-
-nocache_headers();
-
 if ( is_object( $wp_object_cache ) )
 	$wp_object_cache->cache_enabled = false;
 
@@ -113,14 +67,13 @@ function wpmu_activate_stylesheet() {
 	<?php
 }
 add_action( 'wp_head', 'wpmu_activate_stylesheet' );
-add_action( 'wp_head', 'wp_sensitive_page_meta' );
 
 get_header( 'wp-activate' );
 ?>
 
 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( ! $key ) { ?>
+	<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
 
 		<h2><?php _e('Activation Key Required') ?></h2>
 		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
@@ -134,39 +87,42 @@ get_header( 'wp-activate' );
 		</form>
 
 	<?php } else {
-		if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
-			$signup = $result->get_error_data();
-			?>
-			<h2><?php _e( 'Your account is now active!' ); ?></h2>
-			<?php
-			echo '<p class="lead-in">';
-			if ( $signup->domain . $signup->path == '' ) {
-				printf(
-				/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
-					__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					network_site_url( 'wp-login.php', 'login' ),
-					$signup->user_login,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
+
+		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+		$result = wpmu_activate_signup( $key );
+		if ( is_wp_error($result) ) {
+			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+				$signup = $result->get_error_data();
+				?>
+				<h2><?php _e('Your account is now active!'); ?></h2>
+				<?php
+				echo '<p class="lead-in">';
+				if ( $signup->domain . $signup->path == '' ) {
+					printf(
+						/* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
+						__( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+						network_site_url( 'wp-login.php', 'login' ),
+						$signup->user_login,
+						$signup->user_email,
+						wp_lostpassword_url()
+					);
+				} else {
+					printf(
+						/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
+						__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
+						sprintf( '<a href="http://%s">%s</a>', $signup->domain ),
+						$signup->user_login,
+						$signup->user_email,
+						wp_lostpassword_url()
+					);
+				}
+				echo '</p>';
 			} else {
-				printf(
-				/* translators: 1: site URL, 2: username, 3: user email, 4: lost password URL */
-					__( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-					sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
-					$signup->user_login,
-					$signup->user_email,
-					wp_lostpassword_url()
-				);
-			}
-			echo '</p>';
-		} elseif ( $result === null || is_wp_error( $result ) ) {
-			?>
-			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
-			<?php if ( is_wp_error( $result ) ) : ?>
+				?>
+				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 				<p><?php echo $result->get_error_message(); ?></p>
-			<?php endif; ?>
-			<?php
+				<?php
+			}
 		} else {
 			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
 			$user = get_userdata( (int) $result['user_id'] );

wp-admin/about.php

@@ -11,8 +11,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 wp_enqueue_script( 'underscore' );
 
-/* translators: Page title of the About WordPress page in the admin. */
-$title = _x( 'About', 'page title' );
+$title = __( 'About' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
 
@@ -28,167 +27,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
 			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
 			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-			<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+			<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 		</h2>
 
 		<div class="changelog point-releases">
 			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
-			<p>
-				<?php
-				printf(
-					/* translators: %s: WordPress version number */
-					__( '<strong>Version %s</strong> addressed some security issues.' ),
-					'4.9.10'
-				);
-				?>
-				<?php
-				printf(
-					/* translators: %s: HelpHub URL */
-					__( 'For more information, see <a href="%s">the release notes</a>.' ),
-					sprintf(
-						/* translators: %s: WordPress version */
-						esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
-						sanitize_title( '4.9.10' )
-					)
-				);
-				?>
-			</p>
-			<p>
-				<?php
-				/* translators: %s: WordPress version number */
-				printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.9.9' );
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.9' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						46
-					),
-					'4.9.8',
-					number_format_i18n( 46 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.8' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
-						17
-					),
-					'4.9.7',
-					number_format_i18n( 17 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.7' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						18
-					),
-					'4.9.6',
-					number_format_i18n( 18 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.6' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
-						28
-					),
-					'4.9.5',
-					number_format_i18n( 28 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.5' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						1
-					),
-					'4.9.4',
-					number_format_i18n( 1 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.4' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed %2$s bugs.',
-						34
-					),
-					'4.9.3',
-					number_format_i18n( 34 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.3' );
-				?>
-			</p>
-			<p>
-				<?php
-				printf(
-					/* translators: 1: WordPress version number, 2: plural number of bugs. */
-					_n(
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
-						22
-					),
-					'4.9.2',
-					number_format_i18n( 22 )
-				);
-				?>
-				<?php
-				/* translators: %s: Codex URL */
-				printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.9.2' );
-				?>
-			</p>
 			<p>
 				<?php
 				printf(

wp-admin/admin-ajax.php

@@ -65,8 +65,6 @@ $core_actions_post = array(
 	'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
 	'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
 	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
-	'wp-privacy-export-personal-data',
-	'wp-privacy-erase-personal-data',
 );
 
 // Deprecated

wp-admin/credits.php

@@ -28,7 +28,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
 	<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
 	<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
-	<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
+	<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
 <div class="about-wrap-content">
@@ -52,12 +52,6 @@ if ( ! $credits ) {
 
 echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
 
-echo '<p>' . sprintf(
-	/* translators: %s: https://make.wordpress.org/ */
-	__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
-	__( 'https://make.wordpress.org/' )
-) . '</p>';
-
 foreach ( $credits['groups'] as $group_slug => $group_data ) {
 	if ( $group_data['name'] ) {
 		if ( 'Translators' == $group_data['name'] ) {
@@ -107,6 +101,13 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 }
 
 ?>
+<p class="clear"><?php
+	/* translators: %s: https://make.wordpress.org/ */
+	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+		__( 'https://make.wordpress.org/' )
+	);
+?></p>
+
 </div>
 </div>
 <?php

wp-admin/css/about-rtl.css

@@ -260,8 +260,10 @@
 
 .about-wrap .two-col-text {
 	-webkit-column-count: 2;
+	-moz-column-count: 2;
 	column-count: 2;
 	-webkit-column-gap: 40px;
+	-moz-column-gap: 40px;
 	column-gap: 40px;
 }
 
@@ -549,6 +551,7 @@
 @media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
+		-moz-column-count: 1;
 		column-count: 1;
 	}
 

wp-admin/css/about.css

@@ -260,8 +260,10 @@
 
 .about-wrap .two-col-text {
 	-webkit-column-count: 2;
+	-moz-column-count: 2;
 	column-count: 2;
 	-webkit-column-gap: 40px;
+	-moz-column-gap: 40px;
 	column-gap: 40px;
 }
 
@@ -549,6 +551,7 @@
 @media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		-webkit-column-count: 1;
+		-moz-column-count: 1;
 		column-count: 1;
 	}
 

wp-admin/css/common-rtl.css

@@ -1188,19 +1188,11 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
+	display: inline-block;
+	margin: 7px 0 7px 4px;
 	line-height: 16px;
 }
 
-.filter-drawer .filter-group-feature input {
-	position: absolute;
-	margin: 0;
-}
-
-.filter-group .filter-group-feature label {
-	display: block;
-	margin: 14px 23px 14px 0px;
-}
-
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -2981,8 +2973,7 @@ img {
 /* Metabox collapse arrow indicators */
 .sidebar-name .toggle-indicator:before,
 .js .meta-box-sortables .postbox .toggle-indicator:before,
-.bulk-action-notice .toggle-indicator:before,
-.privacy-text-box .toggle-indicator:before {
+.bulk-action-notice .toggle-indicator:before {
 	content: "\f142";
 	display: inline-block;
 	font: normal 20px/1 dashicons;
@@ -2994,8 +2985,7 @@ img {
 
 .js .widgets-holder-wrap.closed .toggle-indicator:before,
 .js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,
-.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before,
-.privacy-text-box.closed .toggle-indicator:before {
+.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before {
 	content: "\f140";
 }
 
@@ -3899,10 +3889,6 @@ img {
 		line-height: 25px;
 	}
 
-	.filter-drawer .filter-group-feature label {
-		margin-right: 32px;
-	}
-
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;
@@ -3945,6 +3931,23 @@ img {
 	}
 }
 
+.options-media-php br {
+	display: none;
+}
+
+@media screen and (max-width: 375px) {
+	.options-media-php input[type="number"][name*="_size_"] {
+		margin: 5px 0;
+	}
+	.options-media-php label[for*="_size_h"]:before {
+		content: '';
+		display: block;
+	}
+	.options-media-php br {
+		display: block;
+	}
+}
+
 @media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */

wp-admin/css/common.css

@@ -1188,19 +1188,11 @@ th.action-links {
 
 .filter-drawer .filter-group-feature input,
 .filter-drawer .filter-group-feature label {
+	display: inline-block;
+	margin: 7px 4px 7px 0;
 	line-height: 16px;
 }
 
-.filter-drawer .filter-group-feature input {
-	position: absolute;
-	margin: 0;
-}
-
-.filter-group .filter-group-feature label {
-	display: block;
-	margin: 14px 0px 14px 23px;
-}
-
 .filter-drawer .buttons {
 	clear: both;
 	margin-bottom: 20px;
@@ -2981,8 +2973,7 @@ img {
 /* Metabox collapse arrow indicators */
 .sidebar-name .toggle-indicator:before,
 .js .meta-box-sortables .postbox .toggle-indicator:before,
-.bulk-action-notice .toggle-indicator:before,
-.privacy-text-box .toggle-indicator:before {
+.bulk-action-notice .toggle-indicator:before {
 	content: "\f142";
 	display: inline-block;
 	font: normal 20px/1 dashicons;
@@ -2994,8 +2985,7 @@ img {
 
 .js .widgets-holder-wrap.closed .toggle-indicator:before,
 .js .meta-box-sortables .postbox.closed .handlediv .toggle-indicator:before,
-.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before,
-.privacy-text-box.closed .toggle-indicator:before {
+.bulk-action-notice .bulk-action-errors-collapsed .toggle-indicator:before {
 	content: "\f140";
 }
 
@@ -3899,10 +3889,6 @@ img {
 		line-height: 25px;
 	}
 
-	.filter-drawer .filter-group-feature label {
-		margin-left: 32px;
-	}
-
 	.wp-filter .button.drawer-toggle {
 		font-size: 13px;
 		line-height: 26px;
@@ -3945,6 +3931,23 @@ img {
 	}
 }
 
+.options-media-php br {
+	display: none;
+}
+
+@media screen and (max-width: 375px) {
+	.options-media-php input[type="number"][name*="_size_"] {
+		margin: 5px 0;
+	}
+	.options-media-php label[for*="_size_h"]:before {
+		content: '';
+		display: block;
+	}
+	.options-media-php br {
+		display: block;
+	}
+}
+
 @media screen and (max-width: 320px) {
 	/* Prevent default center alignment and larger font for the Right Now widget when
 	   the network dashboard is viewed on a small mobile device. */

wp-admin/css/customize-nav-menus-rtl.css

@@ -216,10 +216,6 @@
 	padding-top: 12px;
 }
 
-.menu-location-settings .customize-control-checkbox .theme-location-set {
-	line-height: 1;
-}
-
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }

wp-admin/css/customize-nav-menus.css

@@ -216,10 +216,6 @@
 	padding-top: 12px;
 }
 
-.menu-location-settings .customize-control-checkbox .theme-location-set {
-	line-height: 1;
-}
-
 .customize-control-nav_menu_auto_add label {
 	vertical-align: top;
 }

wp-admin/css/dashboard-rtl.css

@@ -141,7 +141,6 @@
 
 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	left: 10px;
 	padding: 10px 21px 10px 15px;
@@ -166,7 +165,7 @@
 }
 
 .welcome-panel-content {
-	margin: 0 13px;
+	margin-right: 13px;
 	max-width: 1500px;
 }
 
@@ -1224,6 +1223,7 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }
 
 @media screen and ( max-width: 782px ) {

wp-admin/css/dashboard.css

@@ -141,7 +141,6 @@
 
 .welcome-panel .welcome-panel-close {
 	position: absolute;
-	z-index: 10;
 	top: 10px;
 	right: 10px;
 	padding: 10px 15px 10px 21px;
@@ -166,7 +165,7 @@
 }
 
 .welcome-panel-content {
-	margin: 0 13px;
+	margin-left: 13px;
 	max-width: 1500px;
 }
 
@@ -1224,6 +1223,7 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
+
 }
 
 @media screen and ( max-width: 782px ) {

wp-admin/css/edit-rtl.css

@@ -646,93 +646,6 @@ span.wp-media-buttons-icon:before {
  	margin-bottom: 20px;
 }
 
-/* Suggested text for privacy policy */
-.wp-privacy-policy-guide {
-	max-width: 1000px;
-}
-
-.privacy-text-box {
-	width: calc(100% - 260px);
-}
-
-.privacy-text-box-toc {
-	float: left;
-	width: 250px;
-	background-color: #fff;
-}
-
-.privacy-text-box-toc p {
-	margin: 0;
-	padding: 0.7em 1em;
-	border-bottom: 1px solid #eee;
-}
-
-.privacy-text-box-toc ol {
-	margin-right: 2em;
-}
-
-.wp-privacy-policy-guide h3 {
-	font-size: 1.2em;
-	margin: 1em 0 0.5em;
-}
-
-.privacy-text-section .privacy-text-copy {
-	float: left;
-}
-
-.privacy-text-section {
-	position: relative;
-	border-top: 1px solid #e3e3e3;
-}
-
-.privacy-text-box-head,
-.privacy-text-section.text-removed {
-	padding-bottom: 12px;
-}
-
-.text-removed .policy-text {
-	font-style: italic;
-	color: #666;
-	font-weight: 600;
-}
-
-.privacy-text-actions {
-	height: 32px;
-	line-height: 32px;
-	padding-bottom: 6px;
-}
-
-.wp-privacy-policy-guide .policy-text h2 {
-	margin: 1.2em 0 1em;
-	padding: 0;
-}
-
-.suggested-policy-content {
-	font-style: italic;
-}
-
-.privacy-text-section a.return-to-top {
-	float: left;
-	margin-left: -250px;
-	margin-top: 6px;
-}
-
-.hide-privacy-policy-tutorial .privacy-policy-tutorial {
-	visibility: hidden;
-}
-
-.wp-suggested-text p {
-	font-style: italic;
-}
-
-.wp-suggested-text p.privacy-policy-tutorial {
-	font-style: normal;
-}
-
-.notice.wp-pp-notice {
-	margin: 15px 0 3px;
-}
-
 /*------------------------------------------------------------------------------
   11.1 - Custom Fields
 ------------------------------------------------------------------------------*/
@@ -1657,19 +1570,4 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
-	.privacy-text-box {
-		width: auto;
-	}
-	
-	.privacy-text-box-toc {
-		float: none;
-		width: auto;
-		height: 100%;
-	}
-
-	.privacy-text-section a.return-to-top {
-		float: none;
-		margin: 0;
-	}
 }

wp-admin/css/edit.css

@@ -646,93 +646,6 @@ span.wp-media-buttons-icon:before {
  	margin-bottom: 20px;
 }
 
-/* Suggested text for privacy policy */
-.wp-privacy-policy-guide {
-	max-width: 1000px;
-}
-
-.privacy-text-box {
-	width: calc(100% - 260px);
-}
-
-.privacy-text-box-toc {
-	float: right;
-	width: 250px;
-	background-color: #fff;
-}
-
-.privacy-text-box-toc p {
-	margin: 0;
-	padding: 0.7em 1em;
-	border-bottom: 1px solid #eee;
-}
-
-.privacy-text-box-toc ol {
-	margin-left: 2em;
-}
-
-.wp-privacy-policy-guide h3 {
-	font-size: 1.2em;
-	margin: 1em 0 0.5em;
-}
-
-.privacy-text-section .privacy-text-copy {
-	float: right;
-}
-
-.privacy-text-section {
-	position: relative;
-	border-top: 1px solid #e3e3e3;
-}
-
-.privacy-text-box-head,
-.privacy-text-section.text-removed {
-	padding-bottom: 12px;
-}
-
-.text-removed .policy-text {
-	font-style: italic;
-	color: #666;
-	font-weight: 600;
-}
-
-.privacy-text-actions {
-	height: 32px;
-	line-height: 32px;
-	padding-bottom: 6px;
-}
-
-.wp-privacy-policy-guide .policy-text h2 {
-	margin: 1.2em 0 1em;
-	padding: 0;
-}
-
-.suggested-policy-content {
-	font-style: italic;
-}
-
-.privacy-text-section a.return-to-top {
-	float: right;
-	margin-right: -250px;
-	margin-top: 6px;
-}
-
-.hide-privacy-policy-tutorial .privacy-policy-tutorial {
-	visibility: hidden;
-}
-
-.wp-suggested-text p {
-	font-style: italic;
-}
-
-.wp-suggested-text p.privacy-policy-tutorial {
-	font-style: normal;
-}
-
-.notice.wp-pp-notice {
-	margin: 15px 0 3px;
-}
-
 /*------------------------------------------------------------------------------
   11.1 - Custom Fields
 ------------------------------------------------------------------------------*/
@@ -1657,19 +1570,4 @@ table.links-table {
 	.links-table td {
 		padding: 10px 0;
 	}
-	
-	.privacy-text-box {
-		width: auto;
-	}
-	
-	.privacy-text-box-toc {
-		float: none;
-		width: auto;
-		height: 100%;
-	}
-
-	.privacy-text-section a.return-to-top {
-		float: none;
-		margin: 0;
-	}
 }

wp-admin/css/forms-rtl.css

@@ -438,15 +438,7 @@ fieldset label,
 	vertical-align: middle;
 }
 
-.options-media-php [for*="_size_"] {
-	min-width: 10em;
-	vertical-align: baseline;
-}
-
-.options-media-php .small-text[name*="_size_"] {
-	margin: 0 0 1em;
-}
-
+.options-media-php label[for*="_size_"],
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }
@@ -1076,143 +1068,6 @@ table.form-table td .updated p {
 	clear: both;
 }
 
-/*------------------------------------------------------------------------------
-   Privacy Policy settings screen
-------------------------------------------------------------------------------*/
-.tools-privacy-policy-page form {
-	margin-bottom: 1.3em;
-}
-
-.tools-privacy-policy-page input.button,
-.tools-privacy-policy-page select {
-	margin-right: 6px;
-}
-
-.tools-privacy-edit {
-	margin: 1.5em 0;
-}
-
-.tools-privacy-policy-page span {
-	line-height: 2em;
-}
-
-.privacy_requests .column-email {
-	width: 40%;
-}
-
-.privacy_requests .column-type {
-	text-align: center;
-}
-
-.privacy_requests thead td:first-child,
-.privacy_requests tfoot td:first-child {
-	border-right: 4px solid #fff;
-}
-
-.privacy_requests tbody th {
-	border-right: 4px solid #fff;
-	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-
-.privacy_requests tbody .has-request-results th {
-	box-shadow: none;
-}
-
-.privacy_requests tbody .request-results th .notice {
-	margin: 0 0 5px;
-}
-
-.privacy_requests tbody td {
-	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-
-.privacy_requests tbody .has-request-results td {
-	box-shadow: none;
-}
-
-.privacy_requests .next_steps .button {
-	height: auto;
-	line-height: 1.5;
-	padding: 4px 10px;
-	word-break: break-all;
-	white-space: unset;
-}
-
-.privacy_requests .status-request-confirmed th,
-.privacy_requests .status-request-confirmed td {
-	background-color: #f7fcfe;
-	border-right-color: #00a0d2;
-}
-
-.privacy_requests .status-request-failed th,
-.privacy_requests .status-request-failed td {
-	background-color: #fef7f1;
-	border-right-color: #d64d21;
-}
-
-.privacy_requests .export_personal_data_failed a {
-	vertical-align: baseline;
-}
-
-.status-label {
-	font-weight: bold;
-}
-
-.status-label.status-request-pending {
-	font-weight: normal;
-	font-style: italic;
-	color: #6c7781;
-}
-
-.status-label.status-request-failed {
-	color: #aa0000;
-	font-weight: bold;
-}
-
-.wp-privacy-request-form {
-	clear: both;
-}
-
-.wp-privacy-request-form-field {
-	margin: 1.5em 0;
-}
-
-.wp-privacy-request-form label {
-	font-weight: bold;
-	line-height: 1.5;
-	padding-bottom: .5em;
-	display: block;
-}
-
-.wp-privacy-request-form input {
-	line-height: 1.5;
-	margin: 0;
-}
-
-.email-personal-data::before {
-	display: inline-block;
-	font: normal 20px/1 dashicons;
-	margin: 3px -2px 0 5px;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	vertical-align: top;
-}
-
-.email-personal-data--sending::before {
-	color: #f56e28;
-	content: "\f463";
-	-webkit-animation: rotation 2s infinite linear;
-	animation: rotation 2s infinite linear;
-}
-
-.email-personal-data--sent::before {
-	color: #79ba49;
-	content: "\f147";
-}
-
 
 /* =Media Queries
 -------------------------------------------------------------- */
@@ -1490,34 +1345,6 @@ table.form-table td .updated p {
 		max-width: 6.25em;
 		margin: 0;
 	}
-
-	/* Privacy Policy settings screen */
-	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
-	}
-
- 	.tools-privacy-policy-page input#set-page,
-	.tools-privacy-policy-page select {
-		margin: 10px 0 0;
-	}
-
-	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
-	}
-
-	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-right: 0;
-	}
-
-	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
-		display: table-cell;
-	}
-
-	.wp-list-table.privacy_requests.widefat th input,
-	.wp-list-table.privacy_requests.widefat thead td input {
-		margin-right: 5px;
-	}
 }
 
 @media only screen and (max-width: 768px) {
@@ -1568,25 +1395,3 @@ table.form-table td .updated p {
 		margin-left: 0.5em;
 	}
 }
-
-@-webkit-keyframes rotation {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-	100% {
-		-webkit-transform: rotate(-359deg);
-		transform: rotate(-359deg);
-	}
-}
-
-@keyframes rotation {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-	100% {
-		-webkit-transform: rotate(-359deg);
-		transform: rotate(-359deg);
-	}
-}

wp-admin/css/forms.css

@@ -438,15 +438,7 @@ fieldset label,
 	vertical-align: middle;
 }
 
-.options-media-php [for*="_size_"] {
-	min-width: 10em;
-	vertical-align: baseline;
-}
-
-.options-media-php .small-text[name*="_size_"] {
-	margin: 0 0 1em;
-}
-
+.options-media-php label[for*="_size_"],
 #misc-publishing-actions label {
 	vertical-align: baseline;
 }
@@ -1076,143 +1068,6 @@ table.form-table td .updated p {
 	clear: both;
 }
 
-/*------------------------------------------------------------------------------
-   Privacy Policy settings screen
-------------------------------------------------------------------------------*/
-.tools-privacy-policy-page form {
-	margin-bottom: 1.3em;
-}
-
-.tools-privacy-policy-page input.button,
-.tools-privacy-policy-page select {
-	margin-left: 6px;
-}
-
-.tools-privacy-edit {
-	margin: 1.5em 0;
-}
-
-.tools-privacy-policy-page span {
-	line-height: 2em;
-}
-
-.privacy_requests .column-email {
-	width: 40%;
-}
-
-.privacy_requests .column-type {
-	text-align: center;
-}
-
-.privacy_requests thead td:first-child,
-.privacy_requests tfoot td:first-child {
-	border-left: 4px solid #fff;
-}
-
-.privacy_requests tbody th {
-	border-left: 4px solid #fff;
-	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-
-.privacy_requests tbody .has-request-results th {
-	box-shadow: none;
-}
-
-.privacy_requests tbody .request-results th .notice {
-	margin: 0 0 5px;
-}
-
-.privacy_requests tbody td {
-	background: #fff;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,0.1);
-}
-
-.privacy_requests tbody .has-request-results td {
-	box-shadow: none;
-}
-
-.privacy_requests .next_steps .button {
-	height: auto;
-	line-height: 1.5;
-	padding: 4px 10px;
-	word-break: break-all;
-	white-space: unset;
-}
-
-.privacy_requests .status-request-confirmed th,
-.privacy_requests .status-request-confirmed td {
-	background-color: #f7fcfe;
-	border-left-color: #00a0d2;
-}
-
-.privacy_requests .status-request-failed th,
-.privacy_requests .status-request-failed td {
-	background-color: #fef7f1;
-	border-left-color: #d64d21;
-}
-
-.privacy_requests .export_personal_data_failed a {
-	vertical-align: baseline;
-}
-
-.status-label {
-	font-weight: bold;
-}
-
-.status-label.status-request-pending {
-	font-weight: normal;
-	font-style: italic;
-	color: #6c7781;
-}
-
-.status-label.status-request-failed {
-	color: #aa0000;
-	font-weight: bold;
-}
-
-.wp-privacy-request-form {
-	clear: both;
-}
-
-.wp-privacy-request-form-field {
-	margin: 1.5em 0;
-}
-
-.wp-privacy-request-form label {
-	font-weight: bold;
-	line-height: 1.5;
-	padding-bottom: .5em;
-	display: block;
-}
-
-.wp-privacy-request-form input {
-	line-height: 1.5;
-	margin: 0;
-}
-
-.email-personal-data::before {
-	display: inline-block;
-	font: normal 20px/1 dashicons;
-	margin: 3px 5px 0 -2px;
-	speak: none;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-	vertical-align: top;
-}
-
-.email-personal-data--sending::before {
-	color: #f56e28;
-	content: "\f463";
-	-webkit-animation: rotation 2s infinite linear;
-	animation: rotation 2s infinite linear;
-}
-
-.email-personal-data--sent::before {
-	color: #79ba49;
-	content: "\f147";
-}
-
 
 /* =Media Queries
 -------------------------------------------------------------- */
@@ -1490,34 +1345,6 @@ table.form-table td .updated p {
 		max-width: 6.25em;
 		margin: 0;
 	}
-
-	/* Privacy Policy settings screen */
-	.tools-privacy-policy-page form.wp-create-privacy-page {
-	    margin-bottom: 1em;
-	}
-
- 	.tools-privacy-policy-page input#set-page,
-	.tools-privacy-policy-page select {
-		margin: 10px 0 0;
-	}
-
-	.tools-privacy-policy-page .wp-create-privacy-page span {
-	    display: block;
-	    margin-bottom: 1em;
-	}
-
-	.tools-privacy-policy-page .wp-create-privacy-page .button {
-	    margin-left: 0;
-	}
-
-	.wp-list-table.privacy_requests tr:not(.inline-edit-row):not(.no-items) td.column-primary:not(.check-column) {
-		display: table-cell;
-	}
-
-	.wp-list-table.privacy_requests.widefat th input,
-	.wp-list-table.privacy_requests.widefat thead td input {
-		margin-left: 5px;
-	}
 }
 
 @media only screen and (max-width: 768px) {
@@ -1568,25 +1395,3 @@ table.form-table td .updated p {
 		margin-right: 0.5em;
 	}
 }
-
-@-webkit-keyframes rotation {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-	100% {
-		-webkit-transform: rotate(359deg);
-		transform: rotate(359deg);
-	}
-}
-
-@keyframes rotation {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-	100% {
-		-webkit-transform: rotate(359deg);
-		transform: rotate(359deg);
-	}
-}

wp-admin/css/login-rtl.css

@@ -49,7 +49,6 @@ p {
 }
 
 .login .message,
-.login .success,
 .login #login_error {
 	border-right: 4px solid #00a0d2;
 	padding: 12px;
@@ -59,10 +58,6 @@ p {
 	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
 }
 
-.login .success {
-	border-right-color: #46b450;
-}
-
 .login #login_error {
 	border-right-color: #dc3232;
 }
@@ -199,12 +194,6 @@ p {
 	color: #124964;
 }
 
-.login .privacy-policy-page-link {
-	text-align: center;
-	width: 100%;
-	margin: 5em 0 2em;
-}
-
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;

wp-admin/css/login.css

@@ -49,7 +49,6 @@ p {
 }
 
 .login .message,
-.login .success,
 .login #login_error {
 	border-left: 4px solid #00a0d2;
 	padding: 12px;
@@ -59,10 +58,6 @@ p {
 	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.1);
 }
 
-.login .success {
-	border-left-color: #46b450;
-}
-
 .login #login_error {
 	border-left-color: #dc3232;
 }
@@ -199,12 +194,6 @@ p {
 	color: #124964;
 }
 
-.login .privacy-policy-page-link {
-	text-align: center;
-	width: 100%;
-	margin: 5em 0 2em;
-}
-
 .login form .input,
 .login input[type="text"] {
 	font-size: 24px;

wp-admin/css/nav-menus-rtl.css

@@ -785,8 +785,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }
 
 @media screen and ( max-width: 782px ) {
-	body.nav-menus-php,
-	body.wp-customizer {
+	body.nav-menus-php {
 		min-width: 0 !important;
 	}
 

wp-admin/css/nav-menus.css

@@ -785,8 +785,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
 }
 
 @media screen and ( max-width: 782px ) {
-	body.nav-menus-php,
-	body.wp-customizer {
+	body.nav-menus-php {
 		min-width: 0 !important;
 	}
 

wp-admin/css/widgets-rtl.css

@@ -177,7 +177,9 @@
 	cursor: pointer;
 }
 
-.media-widget-preview .placeholder {
+.media-widget-preview.media_image,
+.media-widget-preview.media_audio,
+.attachment-media-view {
 	background: #f1f1f1;
 }
 
@@ -188,7 +190,7 @@
 	background: transparent;
 }
 
-.media-widget-gallery-preview .gallery-item .gallery-icon {
+.media-widget-gallery-preview .gallery-item .gallery-icon { 
 	margin: 4.5%;
 }
 

wp-admin/css/widgets.css

@@ -177,7 +177,9 @@
 	cursor: pointer;
 }
 
-.media-widget-preview .placeholder {
+.media-widget-preview.media_image,
+.media-widget-preview.media_audio,
+.attachment-media-view {
 	background: #f1f1f1;
 }
 
@@ -188,7 +190,7 @@
 	background: transparent;
 }
 
-.media-widget-gallery-preview .gallery-item .gallery-icon {
+.media-widget-gallery-preview .gallery-item .gallery-icon { 
 	margin: 4.5%;
 }
 

wp-admin/custom-header.php

@@ -719,7 +719,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
@@ -877,7 +877,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
 				403
 			);
@@ -885,7 +885,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 				'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
 				403
 			);

wp-admin/customize.php

@@ -14,7 +14,7 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! current_user_can( 'customize' ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
 		403
 	);
@@ -31,7 +31,7 @@ if ( $wp_customize->changeset_post_id() ) {
 
 	if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post->ID ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this changeset.' ) . '</p>',
 			403
 		);
@@ -76,8 +76,8 @@ if ( $wp_customize->changeset_post_id() ) {
 
 	if ( in_array( get_post_status( $changeset_post->ID ), array( 'publish', 'trash' ), true ) ) {
 		wp_die(
-			'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
-			'<p>' . __( 'This changeset cannot be further modified.' ) . '</p>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+			'<p>' . __( 'This changeset has already been published and cannot be further modified.' ) . '</p>' .
 			'<p><a href="' . esc_url( remove_query_arg( 'changeset_uuid' ) ) . '">' . __( 'Customize New Changes' ) . '</a></p>',
 			403
 		);

wp-admin/edit-comments.php

@@ -10,7 +10,7 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 if ( ! current_user_can( 'edit_posts' ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
 		403
 	);

wp-admin/edit-form-comment.php

@@ -29,11 +29,7 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 <div class="inside">
 	<div id="comment-link-box">
 		<strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
-		<span id="sample-permalink">
-			<a href="<?php echo esc_url( $comment_link ); ?>">
-				<?php echo esc_html( $comment_link ); ?>
-			</a>
-		</span>
+		<span id="sample-permalink"><a href="<?php echo $comment_link; ?>"><?php echo $comment_link; ?></a></span>
 	</div>
 </div>
 <?php endif; ?>

wp-admin/edit-tags.php

@@ -23,7 +23,7 @@ if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
 
 if ( ! current_user_can( $tax->cap->manage_terms ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
 		403
 	);
@@ -72,7 +72,7 @@ case 'add-tag':
 
 	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
 			403
 		);
@@ -96,7 +96,7 @@ case 'delete':
 
 	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
 			403
 		);
@@ -116,7 +116,7 @@ case 'bulk-delete':
 
 	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
 			403
 		);
@@ -152,7 +152,7 @@ case 'editedtag':
 
 	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 			403
 		);

wp-admin/edit.php

@@ -36,7 +36,7 @@ if ( ! $post_type_object )
 
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit posts in this post type.' ) . '</p>',
 		403
 	);

wp-admin/freedoms.php

@@ -14,9 +14,6 @@ $title = __( 'Freedoms' );
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
-
-$is_privacy_notice = isset( $_GET['privacy-notice'] );
-
 ?>
 <div class="wrap about-wrap full-width-layout">
 
@@ -29,21 +26,10 @@ $is_privacy_notice = isset( $_GET['privacy-notice'] );
 <h2 class="nav-tab-wrapper wp-clearfix">
 	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
 	<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab<?php if ( ! $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Freedoms' ); ?></a>
-	<a href="freedoms.php?privacy-notice" class="nav-tab<?php if ( $is_privacy_notice ) { echo ' nav-tab-active'; } ?>"><?php _e( 'Privacy' ); ?></a>
+	<a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e( 'Freedoms' ); ?></a>
+	<a href="privacy.php" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 </h2>
 
-<?php if ( $is_privacy_notice ) : ?>
-
-<div class="about-wrap-content">
-	<p class="about-description"><?php _e( 'From time to time, your WordPress site may send data to WordPress.org &#8212; including, but not limited to &#8212; the version of WordPress you are using, and a list of installed plugins and themes.' ); ?></p>
-
-	<p><?php printf( __( 'This data is used to provide general enhancements to WordPress, which includes helping to protect your site by finding and automatically installing new updates. It is also used to calculate statistics, such as those shown on the <a href="%s">WordPress.org stats page</a>.' ), 'https://wordpress.org/about/stats/' ); ?></p>
-
-	<p><?php printf( __( 'We take privacy and transparency very seriously. To learn more about what data we collect, and how we use it, please visit <a href="%s">WordPress.org/about/privacy</a>.' ), 'https://wordpress.org/about/privacy/' ); ?></p>
-</div>
-
-<?php else : ?>
 <div class="about-wrap-content">
 	<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
 
@@ -66,6 +52,5 @@ $is_privacy_notice = isset( $_GET['privacy-notice'] );
 	<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
 </div>
 
-<?php endif; ?>
 </div>
 <?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>

wp-admin/includes/admin-filters.php

@@ -45,11 +45,6 @@ add_action( 'admin_head', 'wp_color_scheme_settings' );
 add_action( 'admin_head', 'wp_site_icon'             );
 add_action( 'admin_head', '_ipad_meta'               );
 
-// Privacy tools
-add_action( 'admin_menu', '_wp_privacy_hook_requests_page' );
-add_action( 'load-tools_page_export_personal_data', '_wp_privacy_requests_screen_options' );
-add_action( 'load-tools_page_remove_personal_data', '_wp_privacy_requests_screen_options' );
-
 // Prerendering.
 if ( ! is_customize_preview() ) {
 	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
@@ -133,24 +128,3 @@ add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async
 add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
 add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
 add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
-
-// Privacy hooks
-add_filter( 'wp_privacy_personal_data_erasure_page', 'wp_privacy_process_personal_data_erasure_page', 10, 5 );
-add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7 );
-add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
-add_action( 'wp_privacy_personal_data_erased', '_wp_privacy_send_erasure_fulfillment_notification', 10 );
-
-// Privacy policy text changes check.
-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 100 );
-
-// Show a "postbox" with the text suggestions for a privacy policy.
-add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'notice' ) );
-
-// Add the suggested policy text from WordPress.
-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );
-
-// Update the cached policy info when the policy page is updated.
-add_action( 'post_updated', array( 'WP_Privacy_Policy_Content', '_policy_page_updated' ) );
-
-// Append '(Draft)' to draft page titles in the privacy page dropdown.
-add_filter( 'list_pages', '_wp_privacy_settings_filter_draft_page_titles', 10, 2 );

wp-admin/includes/ajax-actions.php

@@ -1070,8 +1070,6 @@ function wp_ajax_replyto_comment( $action ) {
 			if ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {
 				kses_remove_filters(); // start with a clean slate
 				kses_init_filters(); // set up the filters
-				remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-				add_filter( 'pre_comment_content', 'wp_filter_kses' );
 			}
 		}
 	} else {
@@ -2094,11 +2092,7 @@ function wp_ajax_upload_attachment() {
 		$post_id = null;
 	}
 
-	$post_data = ! empty( $_REQUEST['post_data'] ) ? _wp_get_allowed_postdata( _wp_translate_postdata( false, (array) $_REQUEST['post_data'] ) ) : array();
-
-	if ( is_wp_error( $post_data ) ) {
-		wp_die( $post_data->get_error_message() );
-	}
+	$post_data = isset( $_REQUEST['post_data'] ) ? $_REQUEST['post_data'] : array();
 
 	// If the context is custom header or background, make sure the uploaded file is an image.
 	if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
@@ -2448,7 +2442,7 @@ function wp_ajax_query_attachments() {
 	$query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
 	$keys = array(
 		's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
-		'post_parent', 'author', 'post__in', 'post__not_in', 'year', 'monthnum'
+		'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
 	);
 	foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
 		if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
@@ -4023,402 +4017,3 @@ function wp_ajax_edit_theme_plugin_file() {
 		) );
 	}
 }
-
-/**
- * Ajax handler for exporting a user's personal data.
- *
- * @since 4.9.6
- */
-function wp_ajax_wp_privacy_export_personal_data() {
-
-	if ( empty( $_POST['id'] ) ) {
-		wp_send_json_error( __( 'Missing request ID.' ) );
-	}
-	$request_id = (int) $_POST['id'];
-
-	if ( $request_id < 1 ) {
-		wp_send_json_error( __( 'Invalid request ID.' ) );
-	}
-
-	if ( ! current_user_can( 'export_others_personal_data' ) ) {
-		wp_send_json_error( __( 'Invalid request.' ) );
-	}
-
-	check_ajax_referer( 'wp-privacy-export-personal-data-' . $request_id, 'security' );
-
-	// Get the request data.
-	$request = wp_get_user_request_data( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request type.' ) );
-	}
-
-	$email_address = $request->email;
-	if ( ! is_email( $email_address ) ) {
-		wp_send_json_error( __( 'A valid email address must be given.' ) );
-	}
-
-	if ( ! isset( $_POST['exporter'] ) ) {
-		wp_send_json_error( __( 'Missing exporter index.' ) );
-	}
-	$exporter_index = (int) $_POST['exporter'];
-
-	if ( ! isset( $_POST['page'] ) ) {
-		wp_send_json_error( __( 'Missing page index.' ) );
-	}
-	$page = (int) $_POST['page'];
-
-	$send_as_email = isset( $_POST['sendAsEmail'] ) ? ( 'true' === $_POST['sendAsEmail'] ) : false;
-
-	/**
-	 * Filters the array of exporter callbacks.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param array $args {
-	 *     An array of callable exporters of personal data. Default empty array.
-	 *
-	 *     @type array {
-	 *         Array of personal data exporters.
-	 *
-	 *         @type string $callback               Callable exporter function that accepts an
-	 *                                              email address and a page and returns an array
-	 *                                              of name => value pairs of personal data.
-	 *         @type string $exporter_friendly_name Translated user facing friendly name for the
-	 *                                              exporter.
-	 *     }
-	 * }
-	 */
-	$exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-
-	if ( ! is_array( $exporters ) ) {
-		wp_send_json_error( __( 'An exporter has improperly used the registration filter.' ) );
-	}
-
-	// Do we have any registered exporters?
-	if ( 0 < count( $exporters ) ) {
-		if ( $exporter_index < 1 ) {
-			wp_send_json_error( __( 'Exporter index cannot be negative.' ) );
-		}
-
-		if ( $exporter_index > count( $exporters ) ) {
-			wp_send_json_error( __( 'Exporter index out of range.' ) );
-		}
-
-		if ( $page < 1 ) {
-			wp_send_json_error( __( 'Page index cannot be less than one.' ) );
-		}
-
-		$exporter_keys = array_keys( $exporters );
-		$exporter_key  = $exporter_keys[ $exporter_index - 1 ];
-		$exporter      = $exporters[ $exporter_key ];
-
-		if ( ! is_array( $exporter ) ) {
-			wp_send_json_error(
-				/* translators: %s: array index */
-				sprintf( __( 'Expected an array describing the exporter at index %s.' ), $exporter_key )
-			);
-		}
-		if ( ! array_key_exists( 'exporter_friendly_name', $exporter ) ) {
-			wp_send_json_error(
-				/* translators: %s: array index */
-				sprintf( __( 'Exporter array at index %s does not include a friendly name.' ), $exporter_key )
-			);
-		}
-		if ( ! array_key_exists( 'callback', $exporter ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Exporter does not include a callback: %s.' ), esc_html( $exporter['exporter_friendly_name'] ) )
-			);
-		}
-		if ( ! is_callable( $exporter['callback'] ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Exporter callback is not a valid callback: %s.' ), esc_html( $exporter['exporter_friendly_name'] ) )
-			);
-		}
-
-		$callback               = $exporter['callback'];
-		$exporter_friendly_name = $exporter['exporter_friendly_name'];
-
-		$response = call_user_func( $callback, $email_address, $page );
-		if ( is_wp_error( $response ) ) {
-			wp_send_json_error( $response );
-		}
-
-		if ( ! is_array( $response ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Expected response as an array from exporter: %s.' ), esc_html( $exporter_friendly_name ) )
-			);
-		}
-		if ( ! array_key_exists( 'data', $response ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Expected data in response array from exporter: %s.' ), esc_html( $exporter_friendly_name ) )
-			);
-		}
-		if ( ! is_array( $response['data'] ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Expected data array in response array from exporter: %s.' ), esc_html( $exporter_friendly_name ) )
-			);
-		}
-		if ( ! array_key_exists( 'done', $response ) ) {
-			wp_send_json_error(
-				/* translators: %s: exporter friendly name */
-				sprintf( __( 'Expected done (boolean) in response array from exporter: %s.' ), esc_html( $exporter_friendly_name ) )
-			);
-		}
-	} else {
-		// No exporters, so we're done.
-		$exporter_key = '';
-
-		$response = array(
-			'data' => array(),
-			'done' => true,
-		);
-	}
-
-	/**
-	 * Filters a page of personal data exporter data. Used to build the export report.
-	 *
-	 * Allows the export response to be consumed by destinations in addition to Ajax.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param array  $response        The personal data for the given exporter and page.
-	 * @param int    $exporter_index  The index of the exporter that provided this data.
-	 * @param string $email_address   The email address associated with this personal data.
-	 * @param int    $page            The page for this response.
-	 * @param int    $request_id      The privacy request post ID associated with this request.
-	 * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
-	 * @param string $exporter_key    The key (slug) of the exporter that provided this data.
-	 */
-	$response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key );
-
-	if ( is_wp_error( $response ) ) {
-		wp_send_json_error( $response );
-	}
-
-	wp_send_json_success( $response );
-}
-
-/**
- * Ajax handler for erasing personal data.
- *
- * @since 4.9.6
- */
-function wp_ajax_wp_privacy_erase_personal_data() {
-
-	if ( empty( $_POST['id'] ) ) {
-		wp_send_json_error( __( 'Missing request ID.' ) );
-	}
-
-	$request_id = (int) $_POST['id'];
-
-	if ( $request_id < 1 ) {
-		wp_send_json_error( __( 'Invalid request ID.' ) );
-	}
-
-	// Both capabilities are required to avoid confusion, see `_wp_personal_data_removal_page()`.
-	if ( ! current_user_can( 'erase_others_personal_data' ) || ! current_user_can( 'delete_users' ) ) {
-		wp_send_json_error( __( 'Invalid request.' ) );
-	}
-
-	check_ajax_referer( 'wp-privacy-erase-personal-data-' . $request_id, 'security' );
-
-	// Get the request data.
-	$request = wp_get_user_request_data( $request_id );
-
-	if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID.' ) );
-	}
-
-	$email_address = $request->email;
-
-	if ( ! is_email( $email_address ) ) {
-		wp_send_json_error( __( 'Invalid email address in request.' ) );
-	}
-
-	if ( ! isset( $_POST['eraser'] ) ) {
-		wp_send_json_error( __( 'Missing eraser index.' ) );
-	}
-
-	$eraser_index = (int) $_POST['eraser'];
-
-	if ( ! isset( $_POST['page'] ) ) {
-		wp_send_json_error( __( 'Missing page index.' ) );
-	}
-
-	$page = (int) $_POST['page'];
-
-	/**
-	 * Filters the array of personal data eraser callbacks.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param array $args {
-	 *     An array of callable erasers of personal data. Default empty array.
-	 *
-	 *     @type array {
-	 *         Array of personal data exporters.
-	 *
-	 *         @type string $callback               Callable eraser that accepts an email address and
-	 *                                              a page and returns an array with boolean values for
-	 *                                              whether items were removed or retained and any messages
-	 *                                              from the eraser, as well as if additional pages are
-	 *                                              available.
-	 *         @type string $exporter_friendly_name Translated user facing friendly name for the eraser.
-	 *     }
-	 * }
-	 */
-	$erasers = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-
-	// Do we have any registered erasers?
-	if ( 0 < count( $erasers ) ) {
-
-		if ( $eraser_index < 1 ) {
-			wp_send_json_error( __( 'Eraser index cannot be less than one.' ) );
-		}
-
-		if ( $eraser_index > count( $erasers ) ) {
-			wp_send_json_error( __( 'Eraser index is out of range.' ) );
-		}
-
-		if ( $page < 1 ) {
-			wp_send_json_error( __( 'Page index cannot be less than one.' ) );
-		}
-
-		$eraser_keys = array_keys( $erasers );
-		$eraser_key  = $eraser_keys[ $eraser_index - 1 ];
-		$eraser      = $erasers[ $eraser_key ];
-
-		if ( ! is_array( $eraser ) ) {
-			/* translators: %d: array index */
-			wp_send_json_error( sprintf( __( 'Expected an array describing the eraser at index %d.' ), $eraser_index ) );
-		}
-
-		if ( ! array_key_exists( 'callback', $eraser ) ) {
-			/* translators: %d: array index */
-			wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a callback.' ), $eraser_index ) );
-		}
-
-		if ( ! is_callable( $eraser['callback'] ) ) {
-			/* translators: %d: array index */
-			wp_send_json_error( sprintf( __( 'Eraser callback at index %d is not a valid callback.' ), $eraser_index ) );
-		}
-
-		if ( ! array_key_exists( 'eraser_friendly_name', $eraser ) ) {
-			/* translators: %d: array index */
-			wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a friendly name.' ), $eraser_index ) );
-		}
-
-		$callback             = $eraser['callback'];
-		$eraser_friendly_name = $eraser['eraser_friendly_name'];
-
-		$response = call_user_func( $callback, $email_address, $page );
-
-		if ( is_wp_error( $response ) ) {
-			wp_send_json_error( $response );
-		}
-
-		if ( ! is_array( $response ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Did not receive array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-
-		if ( ! array_key_exists( 'items_removed', $response ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Expected items_removed key in response array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-
-		if ( ! array_key_exists( 'items_retained', $response ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Expected items_retained key in response array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-
-		if ( ! array_key_exists( 'messages', $response ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Expected messages key in response array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-
-		if ( ! is_array( $response['messages'] ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Expected messages key to reference an array in response array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-
-		if ( ! array_key_exists( 'done', $response ) ) {
-			wp_send_json_error(
-				sprintf(
-					/* translators: 1: eraser friendly name, 2: array index */
-					__( 'Expected done flag in response array from %1$s eraser (index %2$d).' ),
-					esc_html( $eraser_friendly_name ),
-					$eraser_index
-				)
-			);
-		}
-	} else {
-		// No erasers, so we're done.
-		$eraser_key = '';
-
-		$response = array(
-			'items_removed'  => false,
-			'items_retained' => false,
-			'messages'       => array(),
-			'done'           => true,
-		);
-	}
-
-	/**
-	 * Filters a page of personal data eraser data.
-	 *
-	 * Allows the erasure response to be consumed by destinations in addition to Ajax.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param array  $response        The personal data for the given exporter and page.
-	 * @param int    $eraser_index    The index of the eraser that provided this data.
-	 * @param string $email_address   The email address associated with this personal data.
-	 * @param int    $page            The page for this response.
-	 * @param int    $request_id      The privacy request post ID associated with this request.
-	 * @param string $eraser_key      The key (slug) of the eraser that provided this data.
-	 */
-	$response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id, $eraser_key );
-
-	if ( is_wp_error( $response ) ) {
-		wp_send_json_error( $response );
-	}
-
-	wp_send_json_success( $response );
-}

wp-admin/includes/bookmark.php

@@ -28,7 +28,7 @@ function add_link() {
 function edit_link( $link_id = 0 ) {
 	if ( ! current_user_can( 'manage_links' ) ) {
 		wp_die(
-			'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
 			403
 		);

wp-admin/includes/class-wp-community-events.php

@@ -234,6 +234,7 @@ class WP_Community_Events {
 	 */
 	public static function get_unsafe_client_ip() {
 		$client_ip = $netmask = false;
+		$ip_prefix = '';
 
 		// In order of preference, with the best ones for this purpose first.
 		$address_headers = array(
@@ -264,13 +265,43 @@ class WP_Community_Events {
 			return false;
 		}
 
-		$anon_ip = wp_privacy_anonymize_ip( $client_ip, true );
+		// Detect what kind of IP address this is.
+		$is_ipv6 = substr_count( $client_ip, ':' ) > 1;
+		$is_ipv4 = ( 3 === substr_count( $client_ip, '.' ) );
 
-		if ( '0.0.0.0' === $anon_ip || '::' === $anon_ip ) {
+		if ( $is_ipv6 && $is_ipv4 ) {
+			// IPv6 compatibility mode, temporarily strip the IPv6 part, and treat it like IPv4.
+			$ip_prefix = '::ffff:';
+			$client_ip = preg_replace( '/^\[?[0-9a-f:]*:/i', '', $client_ip );
+			$client_ip = str_replace( ']', '', $client_ip );
+			$is_ipv6   = false;
+		}
+
+		if ( $is_ipv6 ) {
+			// IPv6 addresses will always be enclosed in [] if there's a port.
+			$ip_start = 1;
+			$ip_end   = (int) strpos( $client_ip, ']' ) - 1;
+			$netmask  = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000';
+
+			// Strip the port (and [] from IPv6 addresses), if they exist.
+			if ( $ip_end > 0 ) {
+				$client_ip = substr( $client_ip, $ip_start, $ip_end );
+			}
+
+			// Partially anonymize the IP by reducing it to the corresponding network ID.
+			if ( function_exists( 'inet_pton' ) && function_exists( 'inet_ntop' ) ) {
+				$client_ip = inet_ntop( inet_pton( $client_ip ) & inet_pton( $netmask ) );
+			}
+		} elseif ( $is_ipv4 ) {
+			// Strip any port and partially anonymize the IP.
+			$last_octet_position = strrpos( $client_ip, '.' );
+			$client_ip           = substr( $client_ip, 0, $last_octet_position ) . '.0';
+		} else {
 			return false;
 		}
 
-		return $anon_ip;
+		// Restore the IPv6 prefix to compatibility mode addresses.
+		return $ip_prefix . $client_ip;
 	}
 
 	/**
@@ -385,33 +416,20 @@ class WP_Community_Events {
 	}
 
 	/**
-	 * Prepares the event list for presentation.
-	 *
-	 * Discards expired events, and makes WordCamps "sticky." Attendees need more
-	 * advanced notice about WordCamps than they do for meetups, so camps should
-	 * appear in the list sooner. If a WordCamp is coming up, the API will "stick"
-	 * it in the response, even if it wouldn't otherwise appear. When that happens,
-	 * the event will be at the end of the list, and will need to be moved into a
-	 * higher position, so that it doesn't get trimmed off.
+	 * Discards expired events, and reduces the remaining list.
 	 *
 	 * @since 4.8.0
-	 * @since 4.9.7 Stick a WordCamp to the final list.
 	 *
 	 * @param  array $response_body The response body which contains the events.
 	 * @return array The response body with events trimmed.
 	 */
 	protected function trim_events( $response_body ) {
 		if ( isset( $response_body['events'] ) ) {
-			$wordcamps         = array();
 			$current_timestamp = current_time( 'timestamp' );
 
 			foreach ( $response_body['events'] as $key => $event ) {
-				/*
-				 * Skip WordCamps, because they might be multi-day events.
-				 * Save a copy so they can be pinned later.
-				 */
-				if ( 'wordcamp' === $event['type'] ) {
-					$wordcamps[] = $event;
+				// Skip WordCamps, because they might be multi-day events.
+				if ( 'meetup' !== $event['type'] ) {
 					continue;
 				}
 
@@ -423,13 +441,6 @@ class WP_Community_Events {
 			}
 
 			$response_body['events'] = array_slice( $response_body['events'], 0, 3 );
-			$trimmed_event_types     = wp_list_pluck( $response_body['events'], 'type' );
-
-			// Make sure the soonest upcoming WordCamps is pinned in the list.
-			if ( ! in_array( 'wordcamp', $trimmed_event_types ) && $wordcamps ) {
-				array_pop( $response_body['events'] );
-				array_push( $response_body['events'], $wordcamps[0] );
-			}
 		}
 
 		return $response_body;

wp-admin/includes/class-wp-internal-pointers.php

@@ -43,7 +43,7 @@ final class WP_Internal_Pointers {
 		 *     )
 		 */
 		$registered_pointers = array(
-			'index.php' => 'wp496_privacy',
+			// None currently
 		);
 
 		// Check if screen related pointer is registered
@@ -66,11 +66,7 @@ final class WP_Internal_Pointers {
 		 *     )
 		 */
 		$caps_required = array(
-			'wp496_privacy' => array(
-				'manage_privacy_options',
-				'export_others_personal_data',
-				'erase_others_personal_data',
-			),
+			// None currently
 		);
 
 		// Get dismissed pointers
@@ -155,39 +151,6 @@ final class WP_Internal_Pointers {
 	public static function pointer_wp390_widgets() {}
 	public static function pointer_wp410_dfw() {}
 
-	/**
-	 * Display a pointer for the new privacy tools.
-	 *
-	 * @since 4.9.6
-	 */
-	public static function pointer_wp496_privacy() {
-		$content  = '<h3>' . __( 'Personal Data and Privacy' ) . '</h3>';
-		$content .= '<h4>' . __( 'Personal Data Export and Erasure' ) . '</h4>';
-		$content .= '<p>' . __( 'New <strong>Tools</strong> have been added to help you with personal data export and erasure requests.' ) . '</p>';
-		$content .= '<h4>' . __( 'Privacy Policy' ) . '</h4>';
-		$content .= '<p>' . __( 'Create or select your site&#8217;s privacy policy page under <strong>Settings &gt; Privacy</strong> to keep your users informed and aware.' ) . '</p>';
-
-		if ( is_rtl() ) {
-			$position = array(
-				'edge'  => 'right',
-				'align' => 'bottom',
-			);
-		} else {
-			$position = array(
-				'edge'  => 'left',
-				'align' => 'bottom',
-			);
-		}
-
-		$js_args = array(
-			'content'  => $content,
-			'position' => $position,
-			'pointerClass' => 'wp-pointer arrow-bottom',
-			'pointerWidth' => 420,
-		);
-		self::print_js( 'wp496_privacy', '#menu-tools', $js_args );
-	}
-
 	/**
 	 * Prevents new users from seeing existing 'new feature' pointers.
 	 *
@@ -198,6 +161,6 @@ final class WP_Internal_Pointers {
 	 * @param int $user_id User ID.
 	 */
 	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', 'wp496_privacy' );
+		add_user_meta( $user_id, 'dismissed_wp_pointers', '' );
 	}
 }

wp-admin/includes/class-wp-media-list-table.php

@@ -119,15 +119,8 @@ class WP_Media_List_Table extends WP_List_Table {
 				$label[0]
 			);
 		}
-
 		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
 
-		$type_links['mine'] = sprintf(
-			'<option value="mine"%s>%s</option>',
-			selected( 'mine' === $filter, true, false ),
-			_x( 'Mine', 'media items' )
-		);
-
 		if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
 			$type_links['trash'] = sprintf(
 				'<option value="trash"%s>%s</option>',
@@ -135,7 +128,6 @@ class WP_Media_List_Table extends WP_List_Table {
 				_x( 'Trash', 'attachment filter' )
 			);
 		}
-
 		return $type_links;
 	}
 

wp-admin/includes/class-wp-ms-users-list-table.php

@@ -255,10 +255,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	public function column_name( $user ) {
 		if ( $user->first_name && $user->last_name ) {
 			echo "$user->first_name $user->last_name";
-		} elseif ( $user->first_name ) {
-			echo $user->first_name;
-		} elseif ( $user->last_name ) {
-			echo $user->last_name;
 		} else {
 			echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 		}

wp-admin/includes/class-wp-screen.php

@@ -270,9 +270,7 @@ final class WP_Screen {
 
 			switch ( $base ) {
 				case 'post' :
-					if ( isset( $_GET['post'] ) && isset( $_POST['post_ID'] ) && (int) $_GET['post'] !== (int) $_POST['post_ID'] )
-						wp_die( __( 'A post ID mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
-					elseif ( isset( $_GET['post'] ) )
+					if ( isset( $_GET['post'] ) )
 						$post_id = (int) $_GET['post'];
 					elseif ( isset( $_POST['post_ID'] ) )
 						$post_id = (int) $_POST['post_ID'];
@@ -1022,10 +1020,7 @@ final class WP_Screen {
 					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
 				} else {
 					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-					if ( '' === $welcome_checked ) {
-						$welcome_checked = '1';
-					}
-					if ( '2' === $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
 						$welcome_checked = false;
 					}
 				}
@@ -1033,7 +1028,6 @@ final class WP_Screen {
 				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
 				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
 			}
-
 		?>
 		</fieldset>
 		<?php

wp-admin/includes/class-wp-users-list-table.php

@@ -488,10 +488,6 @@ class WP_Users_List_Table extends WP_List_Table {
 					case 'name':
 						if ( $user_object->first_name && $user_object->last_name ) {
 							$r .= "$user_object->first_name $user_object->last_name";
-						} elseif ( $user_object->first_name ) {
-							$r .= $user_object->first_name;
-						} elseif ( $user_object->last_name ) {
-							$r .= $user_object->last_name;
 						} else {
 							$r .= '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . _x( 'Unknown', 'name' ) . '</span>';
 						}

wp-admin/includes/continents-cities.php

@@ -201,7 +201,6 @@ __('Port-au-Prince', 'continents-cities');
 __('Porto Acre', 'continents-cities');
 __('Porto Velho', 'continents-cities');
 __('Puerto Rico', 'continents-cities');
-__('Punta Arenas', 'continents-cities');
 __('Rainy River', 'continents-cities');
 __('Rankin Inlet', 'continents-cities');
 __('Recife', 'continents-cities');
@@ -263,7 +262,6 @@ __('Aqtau', 'continents-cities');
 __('Aqtobe', 'continents-cities');
 __('Ashgabat', 'continents-cities');
 __('Ashkhabad', 'continents-cities');
-__('Atyrau', 'continents-cities');
 __('Baghdad', 'continents-cities');
 __('Bahrain', 'continents-cities');
 __('Baku', 'continents-cities');
@@ -284,7 +282,6 @@ __('Dhaka', 'continents-cities');
 __('Dili', 'continents-cities');
 __('Dubai', 'continents-cities');
 __('Dushanbe', 'continents-cities');
-__('Famagusta', 'continents-cities');
 __('Gaza', 'continents-cities');
 __('Harbin', 'continents-cities');
 __('Hebron', 'continents-cities');
@@ -350,7 +347,6 @@ __('Ust-Nera', 'continents-cities');
 __('Vientiane', 'continents-cities');
 __('Vladivostok', 'continents-cities');
 __('Yakutsk', 'continents-cities');
-__('Yangon', 'continents-cities');
 __('Yekaterinburg', 'continents-cities');
 __('Yerevan', 'continents-cities');
 
@@ -475,7 +471,6 @@ __('Rome', 'continents-cities');
 __('Samara', 'continents-cities');
 __('San Marino', 'continents-cities');
 __('Sarajevo', 'continents-cities');
-__('Saratov', 'continents-cities');
 __('Simferopol', 'continents-cities');
 __('Skopje', 'continents-cities');
 __('Sofia', 'continents-cities');

wp-admin/includes/file.php

@@ -589,7 +589,7 @@ function wp_edit_theme_plugin_file( $args ) {
 			}
 
 			if ( ! isset( $result['message'] ) ) {
-				$message = __( 'Something went wrong.' );
+				$message = __( 'An unidentified error has occurred.' );
 			} else {
 				$message = $result['message'];
 				unset( $result['message'] );
@@ -1797,454 +1797,3 @@ function wp_print_request_filesystem_credentials_modal() {
 	</div>
 	<?php
 }
-
-/**
- * Generate a single group for the personal data export report.
- *
- * @since 4.9.6
- *
- * @param array $group_data {
- *     The group data to render.
- *
- *     @type string $group_label  The user-facing heading for the group, e.g. 'Comments'.
- *     @type array  $items        {
- *         An array of group items.
- *
- *         @type array  $group_item_data  {
- *             An array of name-value pairs for the item.
- *
- *             @type string $name   The user-facing name of an item name-value pair, e.g. 'IP Address'.
- *             @type string $value  The user-facing value of an item data pair, e.g. '50.60.70.0'.
- *         }
- *     }
- * }
- * @return string The HTML for this group and its items.
- */
-function wp_privacy_generate_personal_data_export_group_html( $group_data ) {
-	$allowed_tags      = array(
-		'a' => array(
-			'href'   => array(),
-			'target' => array()
-		),
-		'br' => array()
-	);
-	$allowed_protocols = array( 'http', 'https' );
-	$group_html        = '';
-
-	$group_html .= '<h2>' . esc_html( $group_data['group_label'] ) . '</h2>';
-	$group_html .= '<div>';
-
-	foreach ( (array) $group_data['items'] as $group_item_id => $group_item_data ) {
-		$group_html .= '<table>';
-		$group_html .= '<tbody>';
-
-		foreach ( (array) $group_item_data as $group_item_datum ) {
-			$value = $group_item_datum['value'];
-			// If it looks like a link, make it a link
-			if ( false === strpos( $value, ' ' ) && ( 0 === strpos( $value, 'http://' ) || 0 === strpos( $value, 'https://' ) ) ) {
-				$value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
-			}
-
-			$group_html .= '<tr>';
-			$group_html .= '<th>' . esc_html( $group_item_datum['name'] ) . '</th>';
-			$group_html .= '<td>' . wp_kses( $value, $allowed_tags, $allowed_protocols ) . '</td>';
-			$group_html .= '</tr>';
-		}
-
-		$group_html .= '</tbody>';
-		$group_html .= '</table>';
-	}
-
-	$group_html .= '</div>';
-
-	return $group_html;
-}
-
-/**
- * Generate the personal data export file.
- *
- * @since 4.9.6
- *
- * @param int $request_id The export request ID.
- */
-function wp_privacy_generate_personal_data_export_file( $request_id ) {
-	if ( ! class_exists( 'ZipArchive' ) ) {
-		wp_send_json_error( __( 'Unable to generate export file. ZipArchive not available.' ) );
-	}
-
-	// Get the request data.
-	$request = wp_get_user_request_data( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when generating export file.' ) );
-	}
-
-	$email_address = $request->email;
-
-	if ( ! is_email( $email_address ) ) {
-		wp_send_json_error( __( 'Invalid email address when generating export file.' ) );
-	}
-
-	// Create the exports folder if needed.
-	$exports_dir = wp_privacy_exports_dir();
-	$exports_url = wp_privacy_exports_url();
-
-	if ( ! wp_mkdir_p( $exports_dir ) ) {
-		wp_send_json_error( __( 'Unable to create export folder.' ) );
-	}
-
-	// Protect export folder from browsing.
-	$index_pathname = $exports_dir . 'index.html';
-	if ( ! file_exists( $index_pathname ) ) {
-		$file = fopen( $index_pathname, 'w' );
-		if ( false === $file ) {
-			wp_send_json_error( __( 'Unable to protect export folder from browsing.' ) );
-		}
-		fwrite( $file, '<!-- Silence is golden. -->' );
-		fclose( $file );
-	}
-
-	$stripped_email       = str_replace( '@', '-at-', $email_address );
-	$stripped_email       = sanitize_title( $stripped_email ); // slugify the email address
-	$obscura              = wp_generate_password( 32, false, false );
-	$file_basename        = 'wp-personal-data-file-' . $stripped_email . '-' . $obscura;
-	$html_report_filename = $file_basename . '.html';
-	$html_report_pathname = wp_normalize_path( $exports_dir . $html_report_filename );
-	$file = fopen( $html_report_pathname, 'w' );
-	if ( false === $file ) {
-		wp_send_json_error( __( 'Unable to open export file (HTML report) for writing.' ) );
-	}
-
-	$title = sprintf(
-		/* translators: %s: user's e-mail address */
-		__( 'Personal Data Export for %s' ),
-		$email_address
-	);
-
-	// Open HTML.
-	fwrite( $file, "<!DOCTYPE html>\n" );
-	fwrite( $file, "<html>\n" );
-
-	// Head.
-	fwrite( $file, "<head>\n" );
-	fwrite( $file, "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />\n" );
-	fwrite( $file, "<style type='text/css'>" );
-	fwrite( $file, "body { color: black; font-family: Arial, sans-serif; font-size: 11pt; margin: 15px auto; width: 860px; }" );
-	fwrite( $file, "table { background: #f0f0f0; border: 1px solid #ddd; margin-bottom: 20px; width: 100%; }" );
-	fwrite( $file, "th { padding: 5px; text-align: left; width: 20%; }" );
-	fwrite( $file, "td { padding: 5px; }" );
-	fwrite( $file, "tr:nth-child(odd) { background-color: #fafafa; }" );
-	fwrite( $file, "</style>" );
-	fwrite( $file, "<title>" );
-	fwrite( $file, esc_html( $title ) );
-	fwrite( $file, "</title>" );
-	fwrite( $file, "</head>\n" );
-
-	// Body.
-	fwrite( $file, "<body>\n" );
-
-	// Heading.
-	fwrite( $file, "<h1>" . esc_html__( 'Personal Data Export' ) . "</h1>" );
-
-	// And now, all the Groups.
-	$groups = get_post_meta( $request_id, '_export_data_grouped', true );
-
-	// First, build an "About" group on the fly for this report.
-	$about_group = array(
-		/* translators: Header for the About section in a personal data export. */
-		'group_label' => _x( 'About', 'personal data group label' ),
-		'items'       => array(
-			'about-1' => array(
-				array(
-					'name'  => _x( 'Report generated for', 'email address' ),
-					'value' => $email_address,
-				),
-				array(
-					'name'  => _x( 'For site', 'website name' ),
-					'value' => get_bloginfo( 'name' ),
-				),
-				array(
-					'name'  => _x( 'At URL', 'website URL' ),
-					'value' => get_bloginfo( 'url' ),
-				),
-				array(
-					'name'  => _x( 'On', 'date/time' ),
-					'value' => current_time( 'mysql' ),
-				),
-			),
-		),
-	);
-
-	// Merge in the special about group.
-	$groups = array_merge( array( 'about' => $about_group ), $groups );
-
-	// Now, iterate over every group in $groups and have the formatter render it in HTML.
-	foreach ( (array) $groups as $group_id => $group_data ) {
-		fwrite( $file, wp_privacy_generate_personal_data_export_group_html( $group_data ) );
-	}
-
-	fwrite( $file, "</body>\n" );
-
-	// Close HTML.
-	fwrite( $file, "</html>\n" );
-	fclose( $file );
-
-	/*
-	 * Now, generate the ZIP.
-	 *
-	 * If an archive has already been generated, then remove it and reuse the
-	 * filename, to avoid breaking any URLs that may have been previously sent
-	 * via email.
-	 */
-	$error            = false;
-	$archive_url      = get_post_meta( $request_id, '_export_file_url', true );
-	$archive_pathname = get_post_meta( $request_id, '_export_file_path', true );
-
-	if ( empty( $archive_pathname ) || empty( $archive_url ) ) {
-		$archive_filename = $file_basename . '.zip';
-		$archive_pathname = $exports_dir . $archive_filename;
-		$archive_url      = $exports_url . $archive_filename;
-
-		update_post_meta( $request_id, '_export_file_url', $archive_url );
-		update_post_meta( $request_id, '_export_file_path', wp_normalize_path( $archive_pathname ) );
-	}
-
-	if ( ! empty( $archive_pathname ) && file_exists( $archive_pathname ) ) {
-		wp_delete_file( $archive_pathname );
-	}
-
-	$zip = new ZipArchive;
-	if ( true === $zip->open( $archive_pathname, ZipArchive::CREATE ) ) {
-		if ( ! $zip->addFile( $html_report_pathname, 'index.html' ) ) {
-			$error = __( 'Unable to add data to export file.' );
-		}
-
-		$zip->close();
-
-		if ( ! $error ) {
-			/**
-			 * Fires right after all personal data has been written to the export file.
-			 *
-			 * @since 4.9.6
-			 *
-			 * @param string $archive_pathname     The full path to the export file on the filesystem.
-			 * @param string $archive_url          The URL of the archive file.
-			 * @param string $html_report_pathname The full path to the personal data report on the filesystem.
-			 * @param int    $request_id           The export request ID.
-			 */
-			do_action( 'wp_privacy_personal_data_export_file_created', $archive_pathname, $archive_url, $html_report_pathname, $request_id );
-		}
-	} else {
-		$error = __( 'Unable to open export file (archive) for writing.' );
-	}
-
-	// And remove the HTML file.
-	unlink( $html_report_pathname );
-
-	if ( $error ) {
-		wp_send_json_error( $error );
-	}
-}
-
-/**
- * Send an email to the user with a link to the personal data export file
- *
- * @since 4.9.6
- *
- * @param int $request_id The request ID for this personal data export.
- * @return true|WP_Error True on success or `WP_Error` on failure.
- */
-function wp_privacy_send_personal_data_export_email( $request_id ) {
-	// Get the request data.
-	$request = wp_get_user_request_data( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		return new WP_Error( 'invalid', __( 'Invalid request ID when sending personal data export email.' ) );
-	}
-
-	/** This filter is documented in wp-includes/functions.php */
-	$expiration      = apply_filters( 'wp_privacy_export_expiration', 3 * DAY_IN_SECONDS );
-	$expiration_date = date_i18n( get_option( 'date_format' ), time() + $expiration );
-
-/* translators: Do not translate EXPIRATION, LINK, SITENAME, SITEURL: those are placeholders. */
-$email_text = __(
-'Howdy,
-
-Your request for an export of personal data has been completed. You may
-download your personal data by clicking on the link below. For privacy
-and security, we will automatically delete the file on ###EXPIRATION###,
-so please download it before then.
-
-###LINK###
-
-Regards,
-All at ###SITENAME###
-###SITEURL###'
-);
-
-	/**
-	 * Filters the text of the email sent with a personal data export file.
-	 *
-	 * The following strings have a special meaning and will get replaced dynamically:
-	 * ###EXPIRATION###         The date when the URL will be automatically deleted.
-	 * ###LINK###               URL of the personal data export file for the user.
-	 * ###SITENAME###           The name of the site.
-	 * ###SITEURL###            The URL to the site.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param string $email_text     Text in the email.
-	 * @param int    $request_id     The request ID for this personal data export.
-	 */
-	$content = apply_filters( 'wp_privacy_personal_data_email_content', $email_text, $request_id );
-
-	$email_address = $request->email;
-	$export_file_url = get_post_meta( $request_id, '_export_file_url', true );
-	$site_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	$site_url = home_url();
-
-	$content = str_replace( '###EXPIRATION###', $expiration_date, $content );
-	$content = str_replace( '###LINK###', esc_url_raw( $export_file_url ), $content );
-	$content = str_replace( '###EMAIL###', $email_address, $content );
-	$content = str_replace( '###SITENAME###', $site_name, $content );
-	$content = str_replace( '###SITEURL###', esc_url_raw( $site_url ), $content );
-
-	$mail_success = wp_mail(
-		$email_address,
-		sprintf(
-			__( '[%s] Personal Data Export' ),
-			$site_name
-		),
-		$content
-	);
-
-	if ( ! $mail_success ) {
-		return new WP_Error( 'error', __( 'Unable to send personal data export email.' ) );
-	}
-
-	return true;
-}
-
-/**
- * Intercept personal data exporter page ajax responses in order to assemble the personal data export file.
- * @see wp_privacy_personal_data_export_page
- * @since 4.9.6
- *
- * @param array  $response        The response from the personal data exporter for the given page.
- * @param int    $exporter_index  The index of the personal data exporter. Begins at 1.
- * @param string $email_address   The email address of the user whose personal data this is.
- * @param int    $page            The page of personal data for this exporter. Begins at 1.
- * @param int    $request_id      The request ID for this personal data export.
- * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
- * @param string $exporter_key    The slug (key) of the exporter.
- * @return array The filtered response.
- */
-function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
-	/* Do some simple checks on the shape of the response from the exporter.
-	 * If the exporter response is malformed, don't attempt to consume it - let it
-	 * pass through to generate a warning to the user by default ajax processing.
-	 */
-	if ( ! is_array( $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'done', $response ) ) {
-		return $response;
-	}
-
-	if ( ! array_key_exists( 'data', $response ) ) {
-		return $response;
-	}
-
-	if ( ! is_array( $response['data'] ) ) {
-		return $response;
-	}
-
-	// Get the request data.
-	$request = wp_get_user_request_data( $request_id );
-
-	if ( ! $request || 'export_personal_data' !== $request->action_name ) {
-		wp_send_json_error( __( 'Invalid request ID when merging exporter data.' ) );
-	}
-
-	$export_data = array();
-
-	// First exporter, first page? Reset the report data accumulation array.
-	if ( 1 === $exporter_index && 1 === $page ) {
-		update_post_meta( $request_id, '_export_data_raw', $export_data );
-	} else {
-		$export_data = get_post_meta( $request_id, '_export_data_raw', true );
-	}
-
-	// Now, merge the data from the exporter response into the data we have accumulated already.
-	$export_data = array_merge( $export_data, $response['data'] );
-	update_post_meta( $request_id, '_export_data_raw', $export_data );
-
-	// If we are not yet on the last page of the last exporter, return now.
-	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
-	$is_last_exporter = $exporter_index === count( $exporters );
-	$exporter_done = $response['done'];
-	if ( ! $is_last_exporter || ! $exporter_done ) {
-		return $response;
-	}
-
-	// Last exporter, last page - let's prepare the export file.
-
-	// First we need to re-organize the raw data hierarchically in groups and items.
-	$groups = array();
-	foreach ( (array) $export_data as $export_datum ) {
-		$group_id    = $export_datum['group_id'];
-		$group_label = $export_datum['group_label'];
-		if ( ! array_key_exists( $group_id, $groups ) ) {
-			$groups[ $group_id ] = array(
-				'group_label' => $group_label,
-				'items'       => array(),
-			);
-		}
-
-		$item_id = $export_datum['item_id'];
-		if ( ! array_key_exists( $item_id, $groups[ $group_id ]['items'] ) ) {
-			$groups[ $group_id ]['items'][ $item_id ] = array();
-		}
-
-		$old_item_data = $groups[ $group_id ]['items'][ $item_id ];
-		$merged_item_data = array_merge( $export_datum['data'], $old_item_data );
-		$groups[ $group_id ]['items'][ $item_id ] = $merged_item_data;
-	}
-
-	// Then save the grouped data into the request.
-	delete_post_meta( $request_id, '_export_data_raw' );
-	update_post_meta( $request_id, '_export_data_grouped', $groups );
-
-	/**
-	 * Generate the export file from the collected, grouped personal data.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param int $request_id The export request ID.
-	 */
-	do_action( 'wp_privacy_personal_data_export_file', $request_id );
-
-	// Clear the grouped data now that it is no longer needed.
-	delete_post_meta( $request_id, '_export_data_grouped' );
-
-	// If the destination is email, send it now.
-	if ( $send_as_email ) {
-		$mail_success = wp_privacy_send_personal_data_export_email( $request_id );
-		if ( is_wp_error( $mail_success ) ) {
-			wp_send_json_error( $mail_success->get_error_message() );
-		}
-	} else {
-		// Modify the response to include the URL of the export file so the browser can fetch it.
-		$export_file_url = get_post_meta( $request_id, '_export_file_url', true );
-		if ( ! empty( $export_file_url ) ) {
-			$response['url'] = $export_file_url;
-		}
-	}
-
-	// Update the request to completed state.
-	_wp_privacy_completed_request( $request_id );
-
-	return $response;
-}

wp-admin/includes/image.php

@@ -241,7 +241,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
 			} else {
 				// Force thumbnails to be soft crops.
-				if ( 'thumbnail' !== $s ) {
+				if ( ! 'thumbnail' === $s ) {
 					$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 				}
 			}
@@ -343,7 +343,7 @@ function wp_read_image_metadata( $file ) {
 	if ( ! file_exists( $file ) )
 		return false;
 
-	list( , , $sourceImageType ) = @getimagesize( $file );
+	list( , , $sourceImageType ) = getimagesize( $file );
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -372,10 +372,10 @@ function wp_read_image_metadata( $file ) {
 	 * as caption, description etc.
 	 */
 	if ( is_callable( 'iptcparse' ) ) {
-		@getimagesize( $file, $info );
+		getimagesize( $file, $info );
 
 		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = @iptcparse( $info['APP13'] );
+			$iptc = iptcparse( $info['APP13'] );
 
 			// Headline, "A brief synopsis of the caption."
 			if ( ! empty( $iptc['2#105'][0] ) ) {

wp-admin/includes/media.php

@@ -355,7 +355,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 		}
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
+	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
 		}
@@ -419,7 +419,7 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
 	$content = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = wp_read_image_metadata( $file ) ) {
+	if ( $image_meta = @wp_read_image_metadata($file) ) {
 		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
 			$title = $image_meta['title'];
 		if ( trim( $image_meta['caption'] ) )

wp-admin/includes/misc.php

@@ -194,8 +194,6 @@ function insert_with_markers( $filename, $marker, $insertion ) {
  * @since 1.5.0
  *
  * @global WP_Rewrite $wp_rewrite
- *
- * @return bool|null True on write success, false on failure. Null in multisite.
  */
 function save_mod_rewrite_rules() {
 	if ( is_multisite() )
@@ -203,11 +201,8 @@ function save_mod_rewrite_rules() {
 
 	global $wp_rewrite;
 
-	// Ensure get_home_path() is declared.
-	require_once( ABSPATH . 'wp-admin/includes/file.php' );
-
-	$home_path     = get_home_path();
-	$htaccess_file = $home_path . '.htaccess';
+	$home_path = get_home_path();
+	$htaccess_file = $home_path.'.htaccess';
 
 	/*
 	 * If the file doesn't already exist check for write access to the directory
@@ -231,7 +226,7 @@ function save_mod_rewrite_rules() {
  *
  * @global WP_Rewrite $wp_rewrite
  *
- * @return bool|null True on write success, false on failure. Null in multisite.
+ * @return bool True if web.config was updated successfully
  */
 function iis7_save_url_rewrite_rules(){
 	if ( is_multisite() )
@@ -239,10 +234,7 @@ function iis7_save_url_rewrite_rules(){
 
 	global $wp_rewrite;
 
-	// Ensure get_home_path() is declared.
-	require_once( ABSPATH . 'wp-admin/includes/file.php' );
-
-	$home_path       = get_home_path();
+	$home_path = get_home_path();
 	$web_config_file = $home_path . 'web.config';
 
 	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
@@ -606,8 +598,6 @@ function set_screen_options() {
 			case 'upload_per_page':
 			case 'edit_tags_per_page':
 			case 'plugins_per_page':
-			case 'export_personal_data_requests_per_page':
-			case 'remove_personal_data_requests_per_page':
 			// Network admin
 			case 'sites_network_per_page':
 			case 'users_network_per_page':
@@ -1109,17 +1099,15 @@ function wp_admin_canonical_url() {
  * @since 4.9.0
  */
 function wp_admin_headers() {
-	$policy = 'strict-origin-when-cross-origin';
+	$policy = 'same-origin';
 
 	/**
-	 * Filters the admin referrer policy header value.
+	 * Filters the admin referrer policy header value. Default 'same-origin'.
 	 *
 	 * @since 4.9.0
-	 * @since 4.9.5 The default value was changed to 'strict-origin-when-cross-origin'.
-	 *
 	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy
 	 *
-	 * @param string $policy The admin referrer policy header value. Default 'strict-origin-when-cross-origin'.
+	 * @param string $policy The referrer policy header value.
 	 */
 	$policy = apply_filters( 'admin_referrer_policy', $policy );
 
@@ -1160,7 +1148,7 @@ function update_option_new_admin_email( $old_value, $value ) {
 		return;
 	}
 
-	$hash = md5( $value . time() . wp_rand() );
+	$hash = md5( $value . time() . mt_rand() );
 	$new_admin_email = array(
 		'hash'     => $hash,
 		'newemail' => $value,
@@ -1223,602 +1211,3 @@ All at ###SITENAME###
 		restore_previous_locale();
 	}
 }
-
-/**
- * Appends '(Draft)' to draft page titles in the privacy page dropdown
- * so that unpublished content is obvious.
- *
- * @since 4.9.8
- * @access private
- *
- * @param string  $title Page title.
- * @param WP_Post $page  Page data object.
- *
- * @return string Page title.
- */
-function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) {
-	if ( 'draft' === $page->post_status && 'privacy' === get_current_screen()->id ) {
-		/* translators: %s: Page Title */
-		$title = sprintf( __( '%s (Draft)' ), $title );
-	}
-
-	return $title;
-}
-
-/**
- * WP_Privacy_Policy_Content class.
- * TODO: move this to a new file.
- *
- * @since 4.9.6
- */
-final class WP_Privacy_Policy_Content {
-
-	private static $policy_content = array();
-
-	/**
-	 * Constructor
-	 *
-	 * @since 4.9.6
-	 */
-	private function __construct() {}
-
-	/**
-	 * Add content to the postbox shown when editing the privacy policy.
-	 *
-	 * Plugins and themes should suggest text for inclusion in the site's privacy policy.
-	 * The suggested text should contain information about any functionality that affects user privacy,
-	 * and will be shown in the Suggested Privacy Policy Content postbox.
-	 *
-	 * Intended for use from `wp_add_privacy_policy_content()`.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy.
-	 * @param string $policy_text The suggested content for inclusion in the policy.
-	 */
-	public static function add( $plugin_name, $policy_text ) {
-		if ( empty( $plugin_name ) || empty( $policy_text ) ) {
-			return;
-		}
-
-		$data = array(
-			'plugin_name' => $plugin_name,
-			'policy_text' => $policy_text,
-		);
-
-		if ( ! in_array( $data, self::$policy_content, true ) ) {
-			self::$policy_content[] = $data;
-		}
-	}
-
-	/**
-	 * Quick check if any privacy info has changed.
-	 *
-	 * @since 4.9.6
-	 */
-	public static function text_change_check() {
-
-		$policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
-
-		// The site doesn't have a privacy policy.
-		if ( empty( $policy_page_id ) ) {
-			return false;
-		}
-
-		if ( ! current_user_can( 'edit_post', $policy_page_id ) ) {
-			return false;
-		}
-
-		$old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-
-		// Updates are not relevant if the user has not reviewed any suggestions yet.
-		if ( empty( $old ) ) {
-			return false;
-		}
-
-		$cached = get_option( '_wp_suggested_policy_text_has_changed' );
-
-		/*
-		 * When this function is called before `admin_init`, `self::$policy_content`
-		 * has not been populated yet, so use the cached result from the last
-		 * execution instead.
-		 */
-		if ( ! did_action( 'admin_init' ) ) {
-			return 'changed' === $cached;
-		}
-
-		$new = self::$policy_content;
-
-		// Remove the extra values added to the meta.
-		foreach ( $old as $key => $data ) {
-			if ( ! empty( $data['removed'] ) ) {
-				unset( $old[ $key ] );
-				continue;
-			}
-
-			$old[ $key ] = array(
-				'plugin_name' => $data['plugin_name'],
-				'policy_text' => $data['policy_text'],
-			);
-		}
-
-		// Normalize the order of texts, to facilitate comparison.
-		sort( $old );
-		sort( $new );
-
-		// The == operator (equal, not identical) was used intentionally.
-		// See http://php.net/manual/en/language.operators.array.php
-		if ( $new != $old ) {
-			// A plugin was activated or deactivated, or some policy text has changed.
-			// Show a notice on the relevant screens to inform the admin.
-			add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'policy_text_changed_notice' ) );
-			$state = 'changed';
-		} else {
-			$state = 'not-changed';
-		}
-
-		// Cache the result for use before `admin_init` (see above).
-		if ( $cached !== $state ) {
-			update_option( '_wp_suggested_policy_text_has_changed', $state );
-		}
-
-		return 'changed' === $state;
-	}
-
-	/**
-	 * Output a warning when some privacy info has changed.
-	 *
-	 * @since 4.9.6
-	 */
-	public static function policy_text_changed_notice() {
-		global $post;
-
-		$screen = get_current_screen()->id;
-
-		if ( 'privacy' !== $screen ) {
-			return;
-		}
-
-		?>
-		<div class="policy-text-updated notice notice-warning is-dismissible">
-			<p><?php
-				printf(
-					/* translators: %s: Privacy Policy Guide URL */
-					__( 'The suggested privacy policy text has changed. Please <a href="%s">review the guide</a> and update your privacy policy.' ),
-					esc_url( admin_url( 'tools.php?wp-privacy-policy-guide=1' ) )
-				);
-			?></p>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Update the cached policy info when the policy page is updated.
-	 *
-	 * @since 4.9.6
-	 * @access private
-	 */
-	public static function _policy_page_updated( $post_id ) {
-		$policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
-
-		if ( ! $policy_page_id || $policy_page_id !== (int) $post_id ) {
-			return;
-		}
-
-		// Remove updated|removed status.
-		$old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-		$done = array();
-		$update_cache = false;
-
-		foreach ( $old as $old_key => $old_data ) {
-			if ( ! empty( $old_data['removed'] ) ) {
-				// Remove the old policy text.
-				$update_cache = true;
-				continue;
-			}
-
-			if ( ! empty( $old_data['updated'] ) ) {
-				// 'updated' is now 'added'.
-				$done[] = array(
-					'plugin_name' => $old_data['plugin_name'],
-					'policy_text' => $old_data['policy_text'],
-					'added'       => $old_data['updated'],
-				);
-				$update_cache = true;
-			} else {
-				$done[] = $old_data;
-			}
-		}
-
-		if ( $update_cache ) {
-			delete_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-			// Update the cache.
-			foreach ( $done as $data ) {
-				add_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content', $data );
-			}
-		}
-	}
-
-	/**
-	 * Check for updated, added or removed privacy policy information from plugins.
-	 *
-	 * Caches the current info in post_meta of the policy page.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @return array The privacy policy text/informtion added by core and plugins.
-	 */
-	public static function get_suggested_policy_text() {
-		$policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
-		$checked = array();
-		$time = time();
-		$update_cache = false;
-		$new = self::$policy_content;
-		$old = array();
-
-		if ( $policy_page_id ) {
-			$old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-		}
-
-		// Check for no-changes and updates.
-		foreach ( $new as $new_key => $new_data ) {
-			foreach ( $old as $old_key => $old_data ) {
-				$found = false;
-
-				if ( $new_data['policy_text'] === $old_data['policy_text'] ) {
-					// Use the new plugin name in case it was changed, translated, etc.
-					if ( $old_data['plugin_name'] !== $new_data['plugin_name'] ) {
-						$old_data['plugin_name'] = $new_data['plugin_name'];
-						$update_cache = true;
-					}
-
-					// A plugin was re-activated.
-					if ( ! empty( $old_data['removed'] ) ) {
-						unset( $old_data['removed'] );
-						$old_data['added'] = $time;
-						$update_cache = true;
-					}
-
-					$checked[] = $old_data;
-					$found = true;
-				} elseif ( $new_data['plugin_name'] === $old_data['plugin_name'] ) {
-					// The info for the policy was updated.
-					$checked[] = array(
-						'plugin_name' => $new_data['plugin_name'],
-						'policy_text' => $new_data['policy_text'],
-						'updated'     => $time,
-					);
-					$found = $update_cache = true;
-				}
-
-				if ( $found ) {
-					unset( $new[ $new_key ], $old[ $old_key ] );
-					continue 2;
-				}
-			}
-		}
-
-		if ( ! empty( $new ) ) {
-			// A plugin was activated.
-			foreach ( $new as $new_data ) {
-				if ( ! empty( $new_data['plugin_name'] ) && ! empty( $new_data['policy_text'] ) ) {
-					$new_data['added'] = $time;
-					$checked[]         = $new_data;
-				}
-			}
-			$update_cache = true;
-		}
-
-		if ( ! empty( $old ) ) {
-			// A plugin was deactivated.
-			foreach ( $old as $old_data ) {
-				if ( ! empty( $old_data['plugin_name'] ) && ! empty( $old_data['policy_text'] ) ) {
-					$data = array(
-						'plugin_name' => $old_data['plugin_name'],
-						'policy_text' => $old_data['policy_text'],
-						'removed'     => $time,
-					);
-
-					$checked[] = $data;
-				}
-			}
-			$update_cache = true;
-		}
-
-		if ( $update_cache && $policy_page_id ) {
-			delete_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
-			// Update the cache.
-			foreach ( $checked as $data ) {
-				add_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content', $data );
-			}
-		}
-
-		return $checked;
-	}
-
-	/**
-	 * Add a notice with a link to the guide when editing the privacy policy page.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param WP_Post $post The currently edited post.
-	 */
-	public static function notice( $post ) {
-		if ( ! ( $post instanceof WP_Post ) ) {
-			return;
-		}
-
-		if ( ! current_user_can( 'manage_privacy_options' ) ) {
-			return;
-		}
-
-		$policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
-
-		if ( ! $policy_page_id || $policy_page_id != $post->ID ) {
-			return;
-		}
-
-		?>
-		<div class="notice notice-warning inline wp-pp-notice">
-			<p>
-			<?php
-			/* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
-			printf(
-				__( 'Need help putting together your new Privacy Policy page? <a href="%1$s" %2$s>Check out our guide%3$s</a> for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
-				admin_url( 'tools.php?wp-privacy-policy-guide=1' ),
-				'target="_blank"',
-				sprintf(
-					'<span class="screen-reader-text"> %s</span>',
-					/* translators: accessibility text */
-					__( '(opens in a new tab)' )
-				)
-			);
-			?>
-			</p>
-		</div>
-		<?php
-
-	}
-
-	/**
-	 * Output the privacy policy guide together with content from the theme and plugins.
-	 *
-	 * @since 4.9.6
-	 */
-	public static function privacy_policy_guide() {
-
-		$content_array = self::get_suggested_policy_text();
-
-		$content = '';
-		$toc = array( '<li><a href="#wp-privacy-policy-guide-introduction">' . __( 'Introduction' ) . '</a></li>' );
-		$date_format = __( 'F j, Y' );
-		$copy = __( 'Copy' );
-		$return_to_top = '<a href="#" class="return-to-top">' . __( '&uarr; Return to Top' ) . '</a>';
-
-		foreach ( $content_array as $section ) {
-			$class = $meta = $removed = '';
-
-			if ( ! empty( $section['removed'] ) ) {
-				$class = ' text-removed';
-				$date = date_i18n( $date_format, $section['removed'] );
-				$meta  = sprintf( __( 'Removed %s.' ), $date );
-
-				$removed = __( 'You deactivated this plugin on %s and may no longer need this policy.' );
-				$removed = '<div class="error inline"><p>' . sprintf( $removed, $date ) . '</p></div>';
-			} elseif ( ! empty( $section['updated'] ) ) {
-				$class = ' text-updated';
-				$date = date_i18n( $date_format, $section['updated'] );
-				$meta  = sprintf( __( 'Updated %s.' ), $date );
-			}
-
-			if ( $meta ) {
-				$meta = '<br><span class="privacy-text-meta">' . $meta . '</span>';
-			}
-
-			$plugin_name = esc_html( $section['plugin_name'] );
-			$toc_id = 'wp-privacy-policy-guide-' . sanitize_title( $plugin_name );
-			$toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
-
-			$content .= '<div class="privacy-text-section' . $class . '">';
-			$content .= '<a id="' . $toc_id . '">&nbsp;</a>';
-			/* translators: %s: plugin name */
-			$content .= '<h2>' . sprintf( __( 'Source: %s' ), $plugin_name ) . '</h2>';
-			$content .= $removed;
-
-			$content .= '<div class="policy-text">' . $section['policy_text'] . '</div>';
-			$content .= $return_to_top;
-
-			if ( empty( $section['removed'] ) ) {
-				$content .= '<div class="privacy-text-actions">';
-					$content .= '<button type="button" class="privacy-text-copy button">';
-						$content .= $copy;
-						$content .= '<span class="screen-reader-text">' . sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name ) . '</span>';
-					$content .= '</button>';
-				$content .= '</div>';
-			}
-
-			$content .= "</div>\n"; // End of .privacy-text-section.
-		}
-
-		if ( count( $toc ) > 2 ) {
-			?>
-			<div  class="privacy-text-box-toc">
-				<p><?php _e( 'Table of Contents' ); ?></p>
-				<ol>
-					<?php echo implode( "\n", $toc ); ?>
-				</ol>
-			</div>
-			<?php
-		}
-
-		?>
-		<div class="privacy-text-box">
-			<div class="privacy-text-box-head">
-				<a id="wp-privacy-policy-guide-introduction">&nbsp;</a>
-				<h2><?php _e( 'Introduction' ); ?></h2>
-				<p><?php _e( 'Hello,' ); ?></p>
-				<p><?php _e( 'This text template will help you to create your web site&#8217;s privacy policy.' ); ?></p>
-				<p><?php _e( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
-				<p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
-				<p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
-			</div>
-
-			<div class="privacy-text-box-body">
-				<?php echo $content; ?>
-			</div>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Return the default suggested privacy policy content.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param bool $descr Whether to include the descriptions under the section headings. Default false.
-	 * @return string The default policy content.
-	 */
-	public static function get_default_content( $descr = false ) {
-		$suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
-		$content = '';
-
-		// Start of the suggested privacy policy text.
-		$descr && $content .=
-			'<div class="wp-suggested-text">';
-		$content .=
-			'<h2>' . __( 'Who we are' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>';
-		$content .=
-			/* translators: %s Site URL */
-			'<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
-
-			'<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user&#8217;s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'Comments' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor&#8217;s IP address and browser user agent string to help spam detection.' ) . '</p>' .
-			'<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>' .
-
-			'<h3>' . __( 'Media' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
-
-			'<h3>' . __( 'Contact forms' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'Cookies' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>' .
-			'<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
-			'<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select &quot;Remember Me&quot;, your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
-			'<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p>' .
-
-			'<h3>' . __( 'Embedded content from other websites' ) . '</h3>' .
-			'<p>' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '</p>' .
-			'<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
-
-			'<h3>' . __( 'Analytics' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider&#8217;s privacy policy, if any.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>';
-
-		$content .=
-			'<h2>' . __( 'Who we share your data with' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>';
-
-		$content .=
-			'<h2>' . __( 'How long we retain your data' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>' .
-			'<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
-
-			'<h2>' . __( 'What rights you have over your data' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
-
-			'<h2>' . __( 'Where we send your data' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
-			'<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>';
-		$content .=
-			'<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>' .
-
-			'<h2>' . __( 'Your contact information' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>';
-
-		$content .=
-			'<h2>' . __( 'Additional information' ) . '</h2>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'How we protect your data' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'What third parties we receive data from' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
-
-		$content .=
-			'<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
-		$descr && $content .=
-			'<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
-			'</div>';
-		// End of the suggested privacy policy text.
-
-		/**
-		 * Filters the default content suggested for inclusion in a privacy policy.
-		 *
-		 * @since 4.9.6
-		 *
-		 * @param $content string The default policy content.
-		 */
-		return apply_filters( 'wp_get_default_privacy_policy_content', $content );
-	}
-
-	/**
-	 * Add the suggested privacy policy text to the policy postbox.
-	 *
-	 * @since 4.9.6
-	 */
-	public static function add_suggested_content() {
-		$content = self::get_default_content( true );
-		wp_add_privacy_policy_content( __( 'WordPress' ), $content );
-	}
-}

wp-admin/includes/plugin-install.php

@@ -584,20 +584,12 @@ function install_plugin_information() {
 				<li>
 					<strong><?php _e( 'Requires WordPress Version:' ); ?></strong>
 					<?php
-					/* translators: %s: version number */
+					/* translators: %s: WordPress version */
 					printf( __( '%s or higher' ), $api->requires );
 					?>
 				</li>
 			<?php } if ( ! empty( $api->tested ) ) { ?>
 				<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
-			<?php } if ( ! empty( $api->requires_php ) ) { ?>
-				<li>
-					<strong><?php _e( 'Requires PHP Version:' ); ?></strong>
-					<?php
-					/* translators: %s: version number */
-					printf( __( '%s or higher' ), $api->requires_php );
-					?>
-				</li>
 			<?php } if ( isset( $api->active_installs ) ) { ?>
 				<li><strong><?php _e( 'Active Installations:' ); ?></strong> <?php
 					if ( $api->active_installs >= 1000000 ) {
@@ -636,7 +628,7 @@ function install_plugin_information() {
 				) );
 				?>
 				<div class="counter-container">
-						<span class="counter-label"><a href="https://wordpress.org/support/plugin/<?php echo $api->slug; ?>/reviews/?filter=<?php echo $key; ?>"
+						<span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
 						                               target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
 						<span class="counter-back">
 							<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>

wp-admin/includes/plugin.php

@@ -1896,55 +1896,3 @@ function plugin_sandbox_scrape( $plugin ) {
 	wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
 	include( WP_PLUGIN_DIR . '/' . $plugin );
 }
-
-/**
- * Helper function for adding content to the Privacy Policy Guide.
- *
- * Plugins and themes should suggest text for inclusion in the site's privacy policy.
- * The suggested text should contain information about any functionality that affects user privacy,
- * and will be shown on the Privacy Policy Guide screen.
- *
- * A plugin or theme can use this function multiple times as long as it will help to better present
- * the suggested policy content. For example modular plugins such as WooCommerse or Jetpack
- * can add or remove suggested content depending on the modules/extensions that are enabled.
- * For more information see the Plugin Handbook:
- * https://developer.wordpress.org/plugins/privacy/suggesting-text-for-the-site-privacy-policy/.
- *
- * Intended for use with the `'admin_init'` action.
- *
- * @since 4.9.6
- *
- * @param string $plugin_name The name of the plugin or theme that is suggesting content for the site's privacy policy.
- * @param string $policy_text The suggested content for inclusion in the policy.
- */
-function wp_add_privacy_policy_content( $plugin_name, $policy_text ) {
-	if ( ! is_admin() ) {
-		_doing_it_wrong(
-			__FUNCTION__,
-			sprintf(
-				/* translators: %s: admin_init */
-				__( 'The suggested privacy policy content should be added only in wp-admin by using the %s (or later) action.' ),
-				'<code>admin_init</code>'
-			),
-			'4.9.7'
-		);
-		return;
-	} elseif ( ! doing_action( 'admin_init' ) && ! did_action( 'admin_init' ) ) {
-		_doing_it_wrong(
-			__FUNCTION__,
-			sprintf(
-				/* translators: %s: admin_init */
-				__( 'The suggested privacy policy content should be added by using the %s (or later) action. Please see the inline documentation.' ),
-				'<code>admin_init</code>'
-			),
-			'4.9.7'
-		);
-		return;
-	}
-
-	if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-		require_once( ABSPATH . 'wp-admin/includes/misc.php' );
-	}
-
-	WP_Privacy_Policy_Content::add( $plugin_name, $policy_text );
-}

wp-admin/includes/post.php

@@ -174,27 +174,6 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 	return $post_data;
 }
 
-/**
- * Returns only allowed post data fields
- *
- * @since 4.9.9
- *
- * @param array $post_data Array of post data. Defaults to the contents of $_POST.
- * @return object|bool WP_Error on failure, true on success.
- */
-function _wp_get_allowed_postdata( $post_data = null ) {
-	if ( empty( $post_data ) ) {
-		$post_data = $_POST;
-	}
-
-	// Pass through errors
-	if ( is_wp_error( $post_data ) ) {
-		return $post_data;
-	}
-
-	return array_diff_key( $post_data, array_flip( array( 'meta_input', 'file', 'guid' ) ) );
-}
-
 /**
  * Update an existing post with values provided in $_POST.
  *
@@ -263,7 +242,6 @@ function edit_post( $post_data = null ) {
 	$post_data = _wp_translate_postdata( true, $post_data );
 	if ( is_wp_error($post_data) )
 		wp_die( $post_data->get_error_message() );
-	$translated = _wp_get_allowed_postdata( $post_data );
 
 	// Post Formats
 	if ( isset( $post_data['post_format'] ) )
@@ -343,7 +321,7 @@ function edit_post( $post_data = null ) {
 		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$translated = apply_filters( 'attachment_fields_to_save', $translated, $attachment_data );
+		$post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
 	}
 
 	// Convert taxonomy input to term IDs, to avoid ambiguity.
@@ -388,7 +366,7 @@ function edit_post( $post_data = null ) {
 				}
 			}
 
-			$translated['tax_input'][ $taxonomy ] = $clean_terms;
+			$post_data['tax_input'][ $taxonomy ] = $clean_terms;
 		}
 	}
 
@@ -396,18 +374,18 @@ function edit_post( $post_data = null ) {
 
 	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
 
-	$success = wp_update_post( $translated );
+	$success = wp_update_post( $post_data );
 	// If the save failed, see if we can sanity check the main fields and try again
 	if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
 		$fields = array( 'post_title', 'post_content', 'post_excerpt' );
 
 		foreach ( $fields as $field ) {
-			if ( isset( $translated[ $field ] ) ) {
-				$translated[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $translated[ $field ] );
+			if ( isset( $post_data[ $field ] ) ) {
+				$post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
 			}
 		}
 
-		wp_update_post( $translated );
+		wp_update_post( $post_data );
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
@@ -567,9 +545,9 @@ function bulk_edit_posts( $post_data = null ) {
 			unset( $post_data['tax_input']['category'] );
 		}
 
-		$post_data['post_ID']        = $post_ID;
 		$post_data['post_type'] = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
+		$post_data['guid'] = $post->guid;
 
 		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
 			if ( ! isset( $post_data[ $field ] ) ) {
@@ -577,15 +555,17 @@ function bulk_edit_posts( $post_data = null ) {
 			}
 		}
 
+		$post_data['ID'] = $post_ID;
+		$post_data['post_ID'] = $post_ID;
+
 		$post_data = _wp_translate_postdata( true, $post_data );
 		if ( is_wp_error( $post_data ) ) {
 			$skipped[] = $post_ID;
 			continue;
 		}
-		$post_data = _wp_get_allowed_postdata( $post_data );
 
-		if ( isset( $shared_post_data['post_format'] ) ) {
-			set_post_format( $post_ID, $shared_post_data['post_format'] );
+		if ( isset( $post_data['post_format'] ) ) {
+			set_post_format( $post_ID, $post_data['post_format'] );
 			unset( $post_data['tax_input']['post_format'] );
 		}
 
@@ -777,10 +757,9 @@ function wp_write_post() {
 	$translated = _wp_translate_postdata( false );
 	if ( is_wp_error($translated) )
 		return $translated;
-	$translated = _wp_get_allowed_postdata( $translated );
 
 	// Create the post.
-	$post_ID = wp_insert_post( $translated );
+	$post_ID = wp_insert_post( $_POST );
 	if ( is_wp_error( $post_ID ) )
 		return $post_ID;
 
@@ -1168,10 +1147,6 @@ function wp_edit_attachments_query_vars( $q = false ) {
 		$q['post_parent'] = 0;
 	}
 
-	if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' == $q['attachment-filter'] ) ) {
-		$q['author'] = get_current_user_id();
-	}
-
 	// Filter query clauses to include filenames.
 	if ( isset( $q['s'] ) ) {
 		add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
@@ -1706,7 +1681,6 @@ function wp_create_post_autosave( $post_data ) {
 	$post_data = _wp_translate_postdata( true, $post_data );
 	if ( is_wp_error( $post_data ) )
 		return $post_data;
-	$post_data = _wp_get_allowed_postdata( $post_data );
 
 	$post_author = get_current_user_id();
 

wp-admin/includes/schema.php

@@ -516,12 +516,6 @@ function populate_options() {
 	// 4.4.0
 	'medium_large_size_w' => 768,
 	'medium_large_size_h' => 0,
-
-		// 4.9.6
-		'wp_page_for_privacy_policy'      => 0,
-
-		// 4.9.8
-		'show_comments_cookies_opt_in'    => 0,
 	);
 
 	// 3.3

wp-admin/includes/template.php

@@ -337,16 +337,6 @@ function get_inline_data($post) {
 	if ( post_type_supports( $post->post_type, 'post-formats' ) )
 		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
 
-	/**
-	 * Fires after outputting the fields for the inline editor for posts and pages.
-	 *
-	 * @since 4.9.8
-	 *
-	 * @param WP_Post      $post             The current post object.
-	 * @param WP_Post_Type $post_type_object The current post's post type object.
-	 */
-	do_action( 'add_inline_data', $post, $post_type_object );
-
 	echo '</div>';
 }
 
@@ -1028,7 +1018,7 @@ function do_meta_boxes( $screen, $context, $object ) {
 
 	$hidden = get_hidden_meta_boxes( $screen );
 
-	printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context ) );
+	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
 	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
@@ -1775,10 +1765,6 @@ function _post_states($post) {
 		}
 	}
 
-	if ( intval( get_option( 'wp_page_for_privacy_policy' ) ) === $post->ID ) {
-		$post_states['page_for_privacy_policy'] = __( 'Privacy Policy Page' );
-	}
-
 	/**
 	 * Filters the default post display states used in the posts list table.
 	 *

wp-admin/includes/theme.php

@@ -687,14 +687,14 @@ function customize_themes_print_templates() {
 
 			<div class="theme-actions">
 				<# if ( data.active ) { #>
-					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
+					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></a>
 				<# } else if ( 'installed' === data.type ) { #>
 					<?php if ( current_user_can( 'delete_themes' ) ) { ?>
 						<# if ( data.actions && data.actions['delete'] ) { #>
 							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
 						<# } #>
 					<?php } ?>
-					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
+					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></span>
 				<# } else { #>
 					<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
 					<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>

wp-admin/includes/update-core.php

@@ -743,42 +743,6 @@ $_old_files = array(
 'wp-includes/js/plupload/plupload.silverlight.xap',
 'wp-includes/js/swfupload/plugins',
 'wp-includes/js/swfupload/swfupload.swf',
-	// 4.9.2
-	'wp-includes/js/mediaelement/lang',
-	'wp-includes/js/mediaelement/lang/ca.js',
-	'wp-includes/js/mediaelement/lang/cs.js',
-	'wp-includes/js/mediaelement/lang/de.js',
-	'wp-includes/js/mediaelement/lang/es.js',
-	'wp-includes/js/mediaelement/lang/fa.js',
-	'wp-includes/js/mediaelement/lang/fr.js',
-	'wp-includes/js/mediaelement/lang/hr.js',
-	'wp-includes/js/mediaelement/lang/hu.js',
-	'wp-includes/js/mediaelement/lang/it.js',
-	'wp-includes/js/mediaelement/lang/ja.js',
-	'wp-includes/js/mediaelement/lang/ko.js',
-	'wp-includes/js/mediaelement/lang/nl.js',
-	'wp-includes/js/mediaelement/lang/pl.js',
-	'wp-includes/js/mediaelement/lang/pt.js',
-	'wp-includes/js/mediaelement/lang/ro.js',
-	'wp-includes/js/mediaelement/lang/ru.js',
-	'wp-includes/js/mediaelement/lang/sk.js',
-	'wp-includes/js/mediaelement/lang/sv.js',
-	'wp-includes/js/mediaelement/lang/uk.js',
-	'wp-includes/js/mediaelement/lang/zh-cn.js',
-	'wp-includes/js/mediaelement/lang/zh.js',
-	'wp-includes/js/mediaelement/mediaelement-flash-audio-ogg.swf',
-	'wp-includes/js/mediaelement/mediaelement-flash-audio.swf',
-	'wp-includes/js/mediaelement/mediaelement-flash-video-hls.swf',
-	'wp-includes/js/mediaelement/mediaelement-flash-video-mdash.swf',
-	'wp-includes/js/mediaelement/mediaelement-flash-video.swf',
-	'wp-includes/js/mediaelement/renderers/dailymotion.js',
-	'wp-includes/js/mediaelement/renderers/dailymotion.min.js',
-	'wp-includes/js/mediaelement/renderers/facebook.js',
-	'wp-includes/js/mediaelement/renderers/facebook.min.js',
-	'wp-includes/js/mediaelement/renderers/soundcloud.js',
-	'wp-includes/js/mediaelement/renderers/soundcloud.min.js',
-	'wp-includes/js/mediaelement/renderers/twitch.js',
-	'wp-includes/js/mediaelement/renderers/twitch.min.js',
 );
 
 /**
@@ -1154,11 +1118,7 @@ function update_core($from, $to) {
 		$old_file = $to . $old_file;
 		if ( !$wp_filesystem->exists($old_file) )
 			continue;
-
-		// If the file isn't deleted, try writing an empty string to the file instead.
-		if ( ! $wp_filesystem->delete( $old_file, true ) && $wp_filesystem->is_file( $old_file ) ) {
-			$wp_filesystem->put_contents( $old_file, '' );
-		}
+		$wp_filesystem->delete($old_file, true);
 	}
 
 	// Remove any Genericons example.html's from the filesystem

wp-admin/includes/upgrade.php

@@ -252,52 +252,6 @@ As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to d
 	));
 	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
 
-	// Privacy Policy page
-	if ( is_multisite() ) {
-		// Disable by default unless the suggested content is provided.
-		$privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
-	} else {
-		if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-			include_once( ABSPATH . 'wp-admin/includes/misc.php' );
-		}
-
-		$privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
-	}
-
-	if ( ! empty( $privacy_policy_content ) ) {
-		$privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
-
-		$wpdb->insert(
-			$wpdb->posts, array(
-				'post_author'           => $user_id,
-				'post_date'             => $now,
-				'post_date_gmt'         => $now_gmt,
-				'post_content'          => $privacy_policy_content,
-				'post_excerpt'          => '',
-				'comment_status'        => 'closed',
-				'post_title'            => __( 'Privacy Policy' ),
-				/* translators: Privacy Policy page slug */
-				'post_name'             => __( 'privacy-policy' ),
-				'post_modified'         => $now,
-				'post_modified_gmt'     => $now_gmt,
-				'guid'                  => $privacy_policy_guid,
-				'post_type'             => 'page',
-				'post_status'           => 'draft',
-				'to_ping'               => '',
-				'pinged'                => '',
-				'post_content_filtered' => '',
-			)
-		);
-		$wpdb->insert(
-			$wpdb->postmeta, array(
-				'post_id'    => 3,
-				'meta_key'   => '_wp_page_template',
-				'meta_value' => 'default',
-			)
-		);
-		update_option( 'wp_page_for_privacy_policy', 3 );
-	}
-
 	// Set up default widgets for default theme.
 	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );

wp-admin/index.php

@@ -108,7 +108,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
-	$hide = '0' === $option || ( '2' === $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
+	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
 	if ( $hide )
 		$classes .= ' hidden'; ?>
 

wp-admin/js/customize-controls.js

@@ -2564,7 +2564,7 @@
 
 			// Temporary special function since supplying SFTP credentials does not work yet. See #42184.
 			function disableInstallButtons() {
-				return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
+				return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
 			}
 
 			section.overlay.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
@@ -3074,7 +3074,7 @@
 			api.Panel.prototype.attachEvents.apply( panel );
 
 			// Temporary since supplying SFTP credentials does not work yet. See #42184
-			if ( api.settings.theme._canInstall && api.settings.theme._filesystemCredentialsNeeded ) {
+			if ( api.settings.theme._filesystemCredentialsNeeded ) {
 				panel.notifications.add( new api.Notification( 'theme_install_unavailable', {
 					message: api.l10n.themeInstallUnavailable,
 					type: 'info',
@@ -5132,7 +5132,7 @@
 
 			// Temporary special function since supplying SFTP credentials does not work yet. See #42184.
 			function disableInstallButtons() {
-				return disableSwitchButtons() || false === api.settings.theme._canInstall || true === api.settings.theme._filesystemCredentialsNeeded;
+				return disableSwitchButtons() || true === api.settings.theme._filesystemCredentialsNeeded;
 			}
 			function updateButtons() {
 				control.container.find( 'button.preview, button.preview-theme' ).toggleClass( 'disabled', disableSwitchButtons() );
@@ -6873,7 +6873,7 @@
 
 		cheatin: function() {
 			$( document.body ).empty().addClass( 'cheatin' ).append(
-				'<h1>' + api.l10n.notAllowedHeading + '</h1>' +
+				'<h1>' + api.l10n.cheatin + '</h1>' +
 				'<p>' + api.l10n.notAllowed + '</p>'
 			);
 		},
@@ -7931,7 +7931,7 @@
 				previewerAlive = state.instance( 'previewerAlive' ),
 				editShortcutVisibility  = state.instance( 'editShortcutVisibility' ),
 				changesetLocked = state.instance( 'changesetLocked' ),
-				populateChangesetUuidParam, defaultSelectedChangesetStatus;
+				populateChangesetUuidParam;
 
 			state.bind( 'change', function() {
 				var canSave;
@@ -7965,7 +7965,9 @@
 						} else {
 							saveBtn.val( api.l10n.schedule );
 						}
-					} else if ( api.settings.changeset.currentUserCanPublish ) {
+					} else if ( ! api.settings.changeset.currentUserCanPublish ) {
+						selectedChangesetStatus( 'draft' );
+					} else {
 						saveBtn.val( api.l10n.publish );
 					}
 					closeBtn.find( '.screen-reader-text' ).text( api.l10n.cancel );
@@ -7987,14 +7989,12 @@
 				return status;
 			};
 
-			defaultSelectedChangesetStatus = api.settings.changeset.currentUserCanPublish ? 'publish' : 'draft';
-
 			// Set default states.
 			changesetStatus( api.settings.changeset.status );
 			changesetLocked( Boolean( api.settings.changeset.lockUser ) );
 			changesetDate( api.settings.changeset.publishDate );
 			selectedChangesetDate( api.settings.changeset.publishDate );
-			selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? defaultSelectedChangesetStatus : api.settings.changeset.status );
+			selectedChangesetStatus( '' === api.settings.changeset.status || 'auto-draft' === api.settings.changeset.status ? 'publish' : api.settings.changeset.status );
 			selectedChangesetStatus.link( changesetStatus ); // Ensure that direct updates to status on server via wp.customizer.previewer.save() will update selection.
 			saved( true );
 			if ( '' === changesetStatus() ) { // Handle case for loading starter content.
@@ -8240,7 +8240,6 @@
 			// Check for lock when sending heartbeat requests.
 			$( document ).on( 'heartbeat-send.update_lock_notice', function( event, data ) {
 				data.check_changeset_lock = true;
-				data.changeset_uuid = api.settings.changeset.uuid;
 			} );
 
 			// Handle heartbeat ticks.
@@ -9284,8 +9283,8 @@
 		api.bind( 'change', startAutosaving );
 
 		// Make sure TinyMCE dialogs appear above Customizer UI.
-		$( document ).one( 'tinymce-editor-setup', function() {
-			if ( window.tinymce.ui.FloatPanel && ( ! window.tinymce.ui.FloatPanel.zIndex || window.tinymce.ui.FloatPanel.zIndex < 500001 ) ) {
+		$( document ).one( 'wp-before-tinymce-init', function() {
+			if ( ! window.tinymce.ui.FloatPanel.zIndex || window.tinymce.ui.FloatPanel.zIndex < 500001 ) {
 				window.tinymce.ui.FloatPanel.zIndex = 500001;
 			}
 		} );

wp-admin/js/customize-nav-menus.js

@@ -723,7 +723,7 @@
 			$( 'body' ).removeClass( 'adding-menu-items' );
 			$( '#available-menu-items .menu-item-handle.item-added' ).removeClass( 'item-added' );
 
-			this.$search.val( '' ).trigger( 'keyup' );
+			this.$search.val( '' );
 		},
 
 		// Add a few keyboard enhancements to the panel.

wp-admin/js/editor.js

@@ -280,6 +280,30 @@ window.wp = window.wp || {};
 			return result;
 		}
 
+		/**
+		 * @summary Check if a shortcode has Live Preview enabled for it.
+		 *
+		 * Previewable shortcodes here refers to shortcodes that have Live Preview enabled.
+		 *
+		 * These shortcodes get rewritten when the editor is in Visual mode, which means that
+		 * we don't want to change anything inside them, i.e. inserting a selection marker
+		 * inside the shortcode will break it :(
+		 *
+		 * @link wp-includes/js/mce-view.js
+		 *
+		 * @param {string} shortcode The shortcode to check.
+		 * @return {boolean} If a shortcode has Live Preview or not
+		 */
+		function isShortcodePreviewable( shortcode ) {
+			var defaultPreviewableShortcodes = [ 'caption' ];
+
+			return (
+				defaultPreviewableShortcodes.indexOf( shortcode ) !== -1 ||
+				wp.mce.views.get( shortcode ) !== undefined
+			);
+
+		}
+
 		/**
 		 * @summary Get all shortcodes and their positions in the content
 		 *
@@ -316,12 +340,23 @@ window.wp = window.wp || {};
 				 */
 				var showAsPlainText = shortcodeMatch[1] === '[';
 
+				/**
+				 * For more context check the docs for:
+				 *
+				 * @link isShortcodePreviewable
+				 *
+				 * In addition, if the shortcode will get rendered as plain text ( see above ),
+				 * we can treat it as text and use the selection markers in it.
+				 */
+				var isPreviewable = ! showAsPlainText && isShortcodePreviewable( shortcodeMatch[2] );
+
 				shortcodeInfo = {
 					shortcodeName: shortcodeMatch[2],
 					showAsPlainText: showAsPlainText,
 					startIndex: shortcodeMatch.index,
 					endIndex: shortcodeMatch.index + shortcodeMatch[0].length,
-					length: shortcodeMatch[0].length
+					length: shortcodeMatch[0].length,
+					isPreviewable: isPreviewable
 				};
 
 				shortcodesDetails.push( shortcodeInfo );
@@ -347,6 +382,7 @@ window.wp = window.wp || {};
 					startIndex: shortcodeMatch.index,
 					endIndex: shortcodeMatch.index + shortcodeMatch[ 0 ].length,
 					length: shortcodeMatch[ 0 ].length,
+					isPreviewable: true,
 					urlAtStartOfContent: shortcodeMatch[ 1 ] === '',
 					urlAtEndOfContent: shortcodeMatch[ 3 ] === ''
 				};
@@ -429,7 +465,7 @@ window.wp = window.wp || {};
 			}
 
 			var isCursorStartInShortcode = getShortcodeWrapperInfo( content, cursorStart );
-			if ( isCursorStartInShortcode && ! isCursorStartInShortcode.showAsPlainText ) {
+			if ( isCursorStartInShortcode && isCursorStartInShortcode.isPreviewable ) {
 				/**
 				 * If a URL is at the start or the end of the content,
 				 * the selection doesn't work, because it inserts a marker in the text,
@@ -446,7 +482,7 @@ window.wp = window.wp || {};
 			}
 
 			var isCursorEndInShortcode = getShortcodeWrapperInfo( content, cursorEnd );
-			if ( isCursorEndInShortcode && ! isCursorEndInShortcode.showAsPlainText ) {
+			if ( isCursorEndInShortcode && isCursorEndInShortcode.isPreviewable ) {
 				if ( isCursorEndInShortcode.urlAtEndOfContent ) {
 					cursorEnd = isCursorEndInShortcode.startIndex;
 				} else {
@@ -659,10 +695,10 @@ window.wp = window.wp || {};
 		 */
 		function findBookmarkedPosition( editor ) {
 			// Get the TinyMCE `window` reference, since we need to access the raw selection.
-			var TinyMCEWindow = editor.getWin(),
-				selection = TinyMCEWindow.getSelection();
+			var TinyMCEWIndow = editor.getWin(),
+				selection = TinyMCEWIndow.getSelection();
 
-			if ( ! selection || selection.rangeCount < 1 ) {
+			if ( selection.rangeCount <= 0 ) {
 				// no selection, no need to continue.
 				return;
 			}

wp-admin/js/image-edit.js

@@ -627,7 +627,7 @@
 				 *
 				 * @returns {void}
 				 */
-				parent.children().on( 'mousedown, touchstart', function(e){
+				parent.children().mousedown(function(e){
 					var ratio = false, sel, defRatio;
 
 					if ( e.shiftKey ) {

wp-admin/js/plugin-install.js

@@ -146,13 +146,8 @@ jQuery( document ).ready( function( $ ) {
 		}
 	}
 
-	/*
-	 * Open the Plugin details modal. The event is delegated to get also the links
-	 * in the plugins search tab, after the AJAX search rebuilds the HTML. It's
-	 * delegated on the closest ancestor and not on the body to avoid conflicts
-	 * with other handlers, see Trac ticket #43082.
-	 */
-	$( '.wrap' ).on( 'click', '.thickbox.open-plugin-details-modal', function( e ) {
+	// Open the Plugin details modal.
+	$( '.thickbox.open-plugin-details-modal' ).on( 'click', function( e ) {
 		// The `data-title` attribute is used only in the Plugin screens.
 		var title = $( this ).data( 'title' ) ? plugininstallL10n.plugin_information + ' ' + $( this ).data( 'title' ) : plugininstallL10n.plugin_modal_label;
 

wp-admin/js/plugin-install.min.js

@@ -1 +1 @@
-var tb_position;jQuery(document).ready(function(a){function b(){var b=e.find("#TB_iframeContent");f=b.contents().find("body"),c(),h.focus(),a("#plugin-information-tabs a",f).on("click",function(){c()}),f.on("keydown",function(a){27===a.which&&tb_remove()})}function c(){var b;g=a(":tabbable",f),h=e.find("#TB_closeWindowButton"),i=g.last(),b=h.add(i),b.off("keydown.wp-plugin-details"),b.on("keydown.wp-plugin-details",function(a){d(a)})}function d(a){9===a.which&&(i[0]!==a.target||a.shiftKey?h[0]===a.target&&a.shiftKey&&(a.preventDefault(),i.focus()):(a.preventDefault(),h.focus()))}var e,f,g,h,i,j=a(),k=a(".upload-view-toggle"),l=a(".wrap"),m=a(document.body);tb_position=function(){var b=a(window).width(),c=a(window).height()-(792<b?60:20),d=792<b?772:b-20;return e=a("#TB_window"),e.length&&(e.width(d).height(c),a("#TB_iframeContent").width(d).height(c),e.css({"margin-left":"-"+parseInt(d/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&e.css({top:"30px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+d+"&height="+c))})},a(window).resize(function(){tb_position()}),m.on("thickbox:iframe:loaded",e,function(){e.hasClass("plugin-details-modal")&&b()}).on("thickbox:removed",function(){j.focus()}),a(".wrap").on("click",".thickbox.open-plugin-details-modal",function(b){var c=a(this).data("title")?plugininstallL10n.plugin_information+" "+a(this).data("title"):plugininstallL10n.plugin_modal_label;b.preventDefault(),b.stopPropagation(),j=a(this),tb_click.call(this),e.attr({role:"dialog","aria-label":plugininstallL10n.plugin_modal_label}).addClass("plugin-details-modal"),e.find("#TB_iframeContent").attr("title",c)}),a("#plugin-information-tabs a").click(function(b){var c=a(this).attr("name");b.preventDefault(),a("#plugin-information-tabs a.current").removeClass("current"),a(this).addClass("current"),"description"!==c&&a(window).width()<772?a("#plugin-information-content").find(".fyi").hide():a("#plugin-information-content").find(".fyi").show(),a("#section-holder div.section").hide(),a("#section-"+c).show()}),l.hasClass("plugin-install-tab-upload")||k.attr({role:"button","aria-expanded":"false"}).on("click",function(a){a.preventDefault(),m.toggleClass("show-upload-view"),k.attr("aria-expanded",m.hasClass("show-upload-view"))})});
+var tb_position;jQuery(document).ready(function(a){function b(){var b=e.find("#TB_iframeContent");f=b.contents().find("body"),c(),h.focus(),a("#plugin-information-tabs a",f).on("click",function(){c()}),f.on("keydown",function(a){27===a.which&&tb_remove()})}function c(){var b;g=a(":tabbable",f),h=e.find("#TB_closeWindowButton"),i=g.last(),b=h.add(i),b.off("keydown.wp-plugin-details"),b.on("keydown.wp-plugin-details",function(a){d(a)})}function d(a){9===a.which&&(i[0]!==a.target||a.shiftKey?h[0]===a.target&&a.shiftKey&&(a.preventDefault(),i.focus()):(a.preventDefault(),h.focus()))}var e,f,g,h,i,j=a(),k=a(".upload-view-toggle"),l=a(".wrap"),m=a(document.body);tb_position=function(){var b=a(window).width(),c=a(window).height()-(792<b?60:20),d=792<b?772:b-20;return e=a("#TB_window"),e.length&&(e.width(d).height(c),a("#TB_iframeContent").width(d).height(c),e.css({"margin-left":"-"+parseInt(d/2,10)+"px"}),"undefined"!=typeof document.body.style.maxWidth&&e.css({top:"30px","margin-top":"0"})),a("a.thickbox").each(function(){var b=a(this).attr("href");b&&(b=b.replace(/&width=[0-9]+/g,""),b=b.replace(/&height=[0-9]+/g,""),a(this).attr("href",b+"&width="+d+"&height="+c))})},a(window).resize(function(){tb_position()}),m.on("thickbox:iframe:loaded",e,function(){e.hasClass("plugin-details-modal")&&b()}).on("thickbox:removed",function(){j.focus()}),a(".thickbox.open-plugin-details-modal").on("click",function(b){var c=a(this).data("title")?plugininstallL10n.plugin_information+" "+a(this).data("title"):plugininstallL10n.plugin_modal_label;b.preventDefault(),b.stopPropagation(),j=a(this),tb_click.call(this),e.attr({role:"dialog","aria-label":plugininstallL10n.plugin_modal_label}).addClass("plugin-details-modal"),e.find("#TB_iframeContent").attr("title",c)}),a("#plugin-information-tabs a").click(function(b){var c=a(this).attr("name");b.preventDefault(),a("#plugin-information-tabs a.current").removeClass("current"),a(this).addClass("current"),"description"!==c&&a(window).width()<772?a("#plugin-information-content").find(".fyi").hide():a("#plugin-information-content").find(".fyi").show(),a("#section-holder div.section").hide(),a("#section-"+c).show()}),l.hasClass("plugin-install-tab-upload")||k.attr({role:"button","aria-expanded":"false"}).on("click",function(a){a.preventDefault(),m.toggleClass("show-upload-view"),k.attr("aria-expanded",m.hasClass("show-upload-view"))})});

wp-admin/js/post.js

@@ -1264,5 +1264,4 @@ jQuery(document).ready( function($) {
 
 		update();
 	} );
-
 } )( jQuery, new wp.utils.WordCounter() );

wp-admin/js/updates.js

@@ -585,16 +585,10 @@
 
 		$message
 			.removeClass( 'updating-message' )
-			.addClass( 'updated-message installed' )
+			.addClass( 'updated-message installed button-disabled' )
 			.attr( 'aria-label', wp.updates.l10n.pluginInstalledLabel.replace( '%s', response.pluginName ) )
 			.text( wp.updates.l10n.pluginInstalled );
 
-		if ( $message.hasClass( 'button-primary' ) ) {
-			$message.addClass( 'button-primary-disabled' );
-		} else {
-			$message.addClass( 'button-disabled' );
-		}
-
 		wp.a11y.speak( wp.updates.l10n.installedMsg, 'polite' );
 
 		$document.trigger( 'wp-plugin-install-success', response );
@@ -603,11 +597,10 @@
 			setTimeout( function() {
 
 				// Transform the 'Install' button into an 'Activate' button.
-				$message.removeClass( 'install-now installed button-primary-disabled button-secondary-disabled button-disabled updated-message' )
-					.addClass( 'activate-now' )
+				$message.removeClass( 'install-now installed button-disabled updated-message' ).addClass( 'activate-now button-primary' )
 					.attr( 'href', response.activateUrl )
 					.attr( 'aria-label', wp.updates.l10n.activatePluginLabel.replace( '%s', response.pluginName ) )
-					.text( response.activateLabel || wp.updates.l10n.activatePlugin );
+					.text( wp.updates.l10n.activatePlugin );
 			}, 1000 );
 		}
 	};
@@ -2444,7 +2437,7 @@
 				return;
 			}
 
-			if ( ! message || 'undefined' === typeof message.action ) {
+			if ( 'undefined' === typeof message.action ) {
 				return;
 			}
 

wp-admin/js/widgets.js

@@ -513,10 +513,9 @@ wpWidgets = {
 	save : function( widget, del, animate, order ) {
 		var self = this, data, a,
 			sidebarId = widget.closest( 'div.widgets-sortables' ).attr( 'id' ),
-			form = widget.find( 'form' ),
-			isAdd = widget.find( 'input.add_new' ).val();
+			form = widget.find( 'form' );
 
-		if ( ! del && ! isAdd && form.prop( 'checkValidity' ) && ! form[0].checkValidity() ) {
+		if ( ! del && form.prop( 'checkValidity' ) && ! form[0].checkValidity() ) {
 			return;
 		}
 

wp-admin/js/widgets/custom-html-widgets.js

@@ -204,7 +204,7 @@ wp.customHtmlWidgets = ( function( $ ) {
 				 * @returns {void}
 				 */
 				onUpdateErrorNotice: function onUpdateErrorNotice( errorAnnotations ) {
-					control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length > 0 );
+					control.saveButton.toggleClass( 'validation-blocked disabled', errorAnnotations.length );
 					control.updateErrorNotice( errorAnnotations );
 				}
 			});

wp-admin/js/xfn.js

@@ -15,259 +15,3 @@ jQuery( document ).ready(function( $ ) {
 		$( '#link_rel' ).val( ( isMe ) ? 'me' : inputs.substr( 0,inputs.length - 1 ) );
 	});
 });
-
-// Privacy request action handling
-jQuery( document ).ready( function( $ ) {
-	var strings = window.privacyToolsL10n || {};
-
-	function setActionState( $action, state ) {
-		$action.children().hide();
-		$action.children( '.' + state ).show();
-	}
-
-	function clearResultsAfterRow( $requestRow ) {
-		$requestRow.removeClass( 'has-request-results' );
-
-		if ( $requestRow.next().hasClass( 'request-results' ) ) {
-			$requestRow.next().remove();
-		}
-	}
-
-	function appendResultsAfterRow( $requestRow, classes, summaryMessage, additionalMessages ) {
-		var itemList = '',
-			resultRowClasses = 'request-results';
-
-		clearResultsAfterRow( $requestRow );
-
-		if ( additionalMessages.length ) {
-			$.each( additionalMessages, function( index, value ) {
-				itemList = itemList + '<li>' + value + '</li>';
-			});
-			itemList = '<ul>' + itemList + '</ul>';
-		}
-
-		$requestRow.addClass( 'has-request-results' );
-
-		if ( $requestRow.hasClass( 'status-request-confirmed' ) ) {
-			resultRowClasses = resultRowClasses + ' status-request-confirmed';
-		}
-
-		if ( $requestRow.hasClass( 'status-request-failed' ) ) {
-			resultRowClasses = resultRowClasses + ' status-request-failed';
-		}
-
-		$requestRow.after( function() {
-			return '<tr class="' + resultRowClasses + '"><th colspan="5">' +
-				'<div class="notice inline notice-alt ' + classes + '">' +
-				'<p>' + summaryMessage + '</p>' +
-				itemList +
-				'</div>' +
-				'</td>' +
-				'</tr>';
-		});
-	}
-
-	$( '.export-personal-data-handle' ).click( function( event ) {
-
-		var $this          = $( this ),
-			$action        = $this.parents( '.export-personal-data' ),
-			$requestRow    = $this.parents( 'tr' ),
-			requestID      = $action.data( 'request-id' ),
-			nonce          = $action.data( 'nonce' ),
-			exportersCount = $action.data( 'exporters-count' ),
-			sendAsEmail    = $action.data( 'send-as-email' ) ? true : false;
-
-		event.preventDefault();
-		event.stopPropagation();
-
-		$action.blur();
-		clearResultsAfterRow( $requestRow );
-
-		function onExportDoneSuccess( zipUrl ) {
-			setActionState( $action, 'export-personal-data-success' );
-			if ( 'undefined' !== typeof zipUrl ) {
-				window.location = zipUrl;
-			} else if ( ! sendAsEmail ) {
-				onExportFailure( strings.noExportFile );
-			}
-		}
-
-		function onExportFailure( errorMessage ) {
-			setActionState( $action, 'export-personal-data-failed' );
-			if ( errorMessage ) {
-				appendResultsAfterRow( $requestRow, 'notice-error', strings.exportError, [ errorMessage ] );
-			}
-		}
-
-		function doNextExport( exporterIndex, pageIndex ) {
-			$.ajax(
-				{
-					url: window.ajaxurl,
-					data: {
-						action: 'wp-privacy-export-personal-data',
-						exporter: exporterIndex,
-						id: requestID,
-						page: pageIndex,
-						security: nonce,
-						sendAsEmail: sendAsEmail
-					},
-					method: 'post'
-				}
-			).done( function( response ) {
-				var responseData = response.data;
-
-				if ( ! response.success ) {
-
-					// e.g. invalid request ID
-					onExportFailure( response.data );
-					return;
-				}
-
-				if ( ! responseData.done ) {
-					setTimeout( doNextExport( exporterIndex, pageIndex + 1 ) );
-				} else {
-					if ( exporterIndex < exportersCount ) {
-						setTimeout( doNextExport( exporterIndex + 1, 1 ) );
-					} else {
-						onExportDoneSuccess( responseData.url );
-					}
-				}
-			}).fail( function( jqxhr, textStatus, error ) {
-
-				// e.g. Nonce failure
-				onExportFailure( error );
-			});
-		}
-
-		// And now, let's begin
-		setActionState( $action, 'export-personal-data-processing' );
-		doNextExport( 1, 1 );
-	});
-
-	$( '.remove-personal-data-handle' ).click( function( event ) {
-
-		var $this         = $( this ),
-			$action       = $this.parents( '.remove-personal-data' ),
-			$requestRow   = $this.parents( 'tr' ),
-			requestID     = $action.data( 'request-id' ),
-			nonce         = $action.data( 'nonce' ),
-			erasersCount  = $action.data( 'erasers-count' ),
-			hasRemoved    = false,
-			hasRetained   = false,
-			messages      = [];
-
-		event.stopPropagation();
-
-		$action.blur();
-		clearResultsAfterRow( $requestRow );
-
-		function onErasureDoneSuccess() {
-			var summaryMessage = strings.noDataFound;
-			var classes = 'notice-success';
-
-			setActionState( $action, 'remove-personal-data-idle' );
-
-			if ( false === hasRemoved ) {
-				if ( false === hasRetained ) {
-					summaryMessage = strings.noDataFound;
-				} else {
-					summaryMessage = strings.noneRemoved;
-					classes = 'notice-warning';
-				}
-			} else {
-				if ( false === hasRetained ) {
-					summaryMessage = strings.foundAndRemoved;
-				} else {
-					summaryMessage = strings.someNotRemoved;
-					classes = 'notice-warning';
-				}
-			}
-			appendResultsAfterRow( $requestRow, 'notice-success', summaryMessage, messages );
-		}
-
-		function onErasureFailure() {
-			setActionState( $action, 'remove-personal-data-failed' );
-			appendResultsAfterRow( $requestRow, 'notice-error', strings.removalError, [] );
-		}
-
-		function doNextErasure( eraserIndex, pageIndex ) {
-			$.ajax({
-				url: window.ajaxurl,
-				data: {
-					action: 'wp-privacy-erase-personal-data',
-					eraser: eraserIndex,
-					id: requestID,
-					page: pageIndex,
-					security: nonce
-				},
-				method: 'post'
-			}).done( function( response ) {
-				var responseData = response.data;
-
-				if ( ! response.success ) {
-					onErasureFailure();
-					return;
-				}
-				if ( responseData.items_removed ) {
-					hasRemoved = hasRemoved || responseData.items_removed;
-				}
-				if ( responseData.items_retained ) {
-					hasRetained = hasRetained || responseData.items_retained;
-				}
-				if ( responseData.messages ) {
-					messages = messages.concat( responseData.messages );
-				}
-				if ( ! responseData.done ) {
-					setTimeout( doNextErasure( eraserIndex, pageIndex + 1 ) );
-				} else {
-					if ( eraserIndex < erasersCount ) {
-						setTimeout( doNextErasure( eraserIndex + 1, 1 ) );
-					} else {
-						onErasureDoneSuccess();
-					}
-				}
-			}).fail( function() {
-				onErasureFailure();
-			});
-		}
-
-		// And now, let's begin
-		setActionState( $action, 'remove-personal-data-processing' );
-
-		doNextErasure( 1, 1 );
-	});
-});
-
-( function( $ ) {
-
-	// Privacy policy page, copy button.
-	$( document ).on( 'click', function( event ) {
-		var $target = $( event.target );
-		var $parent, $container, range;
-
-		if ( $target.is( 'button.privacy-text-copy' ) ) {
-			$parent = $target.parent().parent();
-			$container = $parent.find( 'div.wp-suggested-text' );
-
-			if ( ! $container.length ) {
-				$container = $parent.find( 'div.policy-text' );
-			}
-
-			if ( $container.length ) {
-				try {
-					window.getSelection().removeAllRanges();
-					range = document.createRange();
-					$container.addClass( 'hide-privacy-policy-tutorial' );
-
-					range.selectNodeContents( $container[0] );
-					window.getSelection().addRange( range );
-					document.execCommand( 'copy' );
-
-					$container.removeClass( 'hide-privacy-policy-tutorial' );
-					window.getSelection().removeAllRanges();
-				} catch ( er ) {}
-			}
-		}
-	});
-
-} ( jQuery ) );

wp-admin/js/xfn.min.js

@@ -1 +1 @@
-jQuery(document).ready(function(a){a("#link_rel").prop("readonly",!0),a("#linkxfndiv input").bind("click keyup",function(){var b=a("#me").is(":checked"),c="";a("input.valinp").each(function(){b?a(this).prop("disabled",!0).parent().addClass("disabled"):(a(this).removeAttr("disabled").parent().removeClass("disabled"),a(this).is(":checked")&&""!==a(this).val()&&(c+=a(this).val()+" "))}),a("#link_rel").val(b?"me":c.substr(0,c.length-1))})}),jQuery(document).ready(function(a){function b(a,b){a.children().hide(),a.children("."+b).show()}function c(a){a.removeClass("has-request-results"),a.next().hasClass("request-results")&&a.next().remove()}function d(b,d,e,f){var g="",h="request-results";c(b),f.length&&(a.each(f,function(a,b){g=g+"<li>"+b+"</li>"}),g="<ul>"+g+"</ul>"),b.addClass("has-request-results"),b.hasClass("status-request-confirmed")&&(h+=" status-request-confirmed"),b.hasClass("status-request-failed")&&(h+=" status-request-failed"),b.after(function(){return'<tr class="'+h+'"><th colspan="5"><div class="notice inline notice-alt '+d+'"><p>'+e+"</p>"+g+"</div></td></tr>"})}var e=window.privacyToolsL10n||{};a(".export-personal-data-handle").click(function(f){function g(a){b(k,"export-personal-data-success"),"undefined"!=typeof a?window.location=a:p||h(e.noExportFile)}function h(a){b(k,"export-personal-data-failed"),a&&d(l,"notice-error",e.exportError,[a])}function i(b,c){a.ajax({url:window.ajaxurl,data:{action:"wp-privacy-export-personal-data",exporter:b,id:m,page:c,security:n,sendAsEmail:p},method:"post"}).done(function(a){var d=a.data;return a.success?void(d.done?b<o?setTimeout(i(b+1,1)):g(d.url):setTimeout(i(b,c+1))):void h(a.data)}).fail(function(a,b,c){h(c)})}var j=a(this),k=j.parents(".export-personal-data"),l=j.parents("tr"),m=k.data("request-id"),n=k.data("nonce"),o=k.data("exporters-count"),p=!!k.data("send-as-email");f.preventDefault(),f.stopPropagation(),k.blur(),c(l),b(k,"export-personal-data-processing"),i(1,1)}),a(".remove-personal-data-handle").click(function(f){function g(){var a=e.noDataFound,c="notice-success";b(k,"remove-personal-data-idle"),!1===p?!1===q?a=e.noDataFound:(a=e.noneRemoved,c="notice-warning"):!1===q?a=e.foundAndRemoved:(a=e.someNotRemoved,c="notice-warning"),d(l,"notice-success",a,r)}function h(){b(k,"remove-personal-data-failed"),d(l,"notice-error",e.removalError,[])}function i(b,c){a.ajax({url:window.ajaxurl,data:{action:"wp-privacy-erase-personal-data",eraser:b,id:m,page:c,security:n},method:"post"}).done(function(a){var d=a.data;return a.success?(d.items_removed&&(p=p||d.items_removed),d.items_retained&&(q=q||d.items_retained),d.messages&&(r=r.concat(d.messages)),void(d.done?b<o?setTimeout(i(b+1,1)):g():setTimeout(i(b,c+1)))):void h()}).fail(function(){h()})}var j=a(this),k=j.parents(".remove-personal-data"),l=j.parents("tr"),m=k.data("request-id"),n=k.data("nonce"),o=k.data("erasers-count"),p=!1,q=!1,r=[];f.stopPropagation(),k.blur(),c(l),b(k,"remove-personal-data-processing"),i(1,1)})}),function(a){a(document).on("click",function(b){var c,d,e,f=a(b.target);if(f.is("button.privacy-text-copy")&&(c=f.parent().parent(),d=c.find("div.wp-suggested-text"),d.length||(d=c.find("div.policy-text")),d.length))try{window.getSelection().removeAllRanges(),e=document.createRange(),d.addClass("hide-privacy-policy-tutorial"),e.selectNodeContents(d[0]),window.getSelection().addRange(e),document.execCommand("copy"),d.removeClass("hide-privacy-policy-tutorial"),window.getSelection().removeAllRanges()}catch(g){}})}(jQuery);
+jQuery(document).ready(function(a){a("#link_rel").prop("readonly",!0),a("#linkxfndiv input").bind("click keyup",function(){var b=a("#me").is(":checked"),c="";a("input.valinp").each(function(){b?a(this).prop("disabled",!0).parent().addClass("disabled"):(a(this).removeAttr("disabled").parent().removeClass("disabled"),a(this).is(":checked")&&""!==a(this).val()&&(c+=a(this).val()+" "))}),a("#link_rel").val(b?"me":c.substr(0,c.length-1))})});

wp-admin/load-scripts.php

@@ -28,6 +28,8 @@ require( ABSPATH . 'wp-admin/includes/noop.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
 require( ABSPATH . WPINC . '/version.php' );
 
+$compress = ( isset($_GET['c']) && $_GET['c'] );
+$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
 $expires_offset = 31536000; // 1 year
 $out = '';
 
@@ -56,5 +58,16 @@ header('Content-Type: application/javascript; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+	header('Vary: Accept-Encoding'); // Handle proxies
+	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+		header('Content-Encoding: deflate');
+		$out = gzdeflate( $out, 3 );
+	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+		header('Content-Encoding: gzip');
+		$out = gzencode( $out, 3 );
+	}
+}
+
 echo $out;
 exit;

wp-admin/load-styles.php

@@ -28,6 +28,8 @@ $load = array_unique( explode( ',', $load ) );
 if ( empty($load) )
 	exit;
 
+$compress = ( isset($_GET['c']) && $_GET['c'] );
+$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
 $rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
 $expires_offset = 31536000; // 1 year
 $out = '';
@@ -78,5 +80,16 @@ header('Content-Type: text/css; charset=UTF-8');
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
+if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+	header('Vary: Accept-Encoding'); // Handle proxies
+	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+		header('Content-Encoding: deflate');
+		$out = gzdeflate( $out, 3 );
+	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+		header('Content-Encoding: gzip');
+		$out = gzencode( $out, 3 );
+	}
+}
+
 echo $out;
 exit;

wp-admin/media-upload.php

@@ -34,7 +34,7 @@ $post_id = isset($post_id)? (int) $post_id : 0;
 // Require an ID for the edit screen.
 if ( isset( $action ) && $action == 'edit' && !$ID ) {
 	wp_die(
-		'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Invalid item ID.' ) . '</p>',
 		403
 	);
@@ -42,7 +42,7 @@ if ( isset( $action ) && $action == 'edit' && !$ID ) {
 
 if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
 		403
 	);

wp-admin/menu.php

@@ -249,21 +249,13 @@ $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-ic
 	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
 		$submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php');
 
-$change_notice = '';
-if ( current_user_can( 'manage_privacy_options' ) && WP_Privacy_Policy_Content::text_change_check() ) {
-	$change_notice = ' <span class="update-plugins 1"><span class="plugin-count">' . number_format_i18n( 1 ) . '</span></span>';
-}
-
-// translators: %s is the update notification bubble, if updates are available.
-$menu[80]                               = array( sprintf( __( 'Settings %s' ), $change_notice ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
-	$submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' );
-	$submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' );
-	$submenu['options-general.php'][20] = array( __( 'Reading' ), 'manage_options', 'options-reading.php' );
-	$submenu['options-general.php'][25] = array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' );
-	$submenu['options-general.php'][30] = array( __( 'Media' ), 'manage_options', 'options-media.php' );
-	$submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' );
-	// translators: %s is the update notification bubble, if updates are available.
-	$submenu['options-general.php'][45] = array( sprintf( __( 'Privacy %s' ), $change_notice ), 'manage_privacy_options', 'privacy.php' );
+$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
+	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
+	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
+	$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
+	$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
+	$submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
+	$submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 

wp-admin/nav-menus.php

@@ -21,7 +21,7 @@ if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets'
 // Permissions Check
 if ( ! current_user_can( 'edit_theme_options' ) ) {
 	wp_die(
-		'<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
+		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
 		403
 	);

wp-admin/network/settings.php

@@ -83,7 +83,7 @@ if ( $_POST ) {
 	);
 
 	// Handle translation installation.
-	if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
+	if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
 		$language = wp_download_language_pack( $_POST['WPLANG'] );
 		if ( $language ) {
 			$_POST['WPLANG'] = $language;
@@ -374,16 +374,14 @@ if ( isset( $_GET['updated'] ) ) {
 							$lang = '';
 						}
 
-						wp_dropdown_languages(
-							array(
-								'name'         => 'WPLANG',
-								'id'           => 'WPLANG',
-								'selected'     => $lang,
-								'languages'    => $languages,
-								'translations' => $translations,
-								'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
-							)
-						);
+						wp_dropdown_languages( array(
+							'name'         => 'WPLANG',
+							'id'           => 'WPLANG',
+							'selected'     => $lang,
+							'languages'    => $languages,
+							'translations' => $translations,
+							'show_available_translations' => current_user_can( 'install_languages' ),
+						) );
 						?>
 					</td>
 				</tr>

wp-admin/network/site-new.php

@@ -68,7 +68,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 			$meta['WPLANG'] = ''; // en_US
 		} elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
 			$meta['WPLANG'] = $_POST['WPLANG'];
-		} elseif ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
+		} elseif ( current_user_can( 'install_languages' ) ) {
 			$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
 			if ( $language ) {
 				$meta['WPLANG'] = $language;
@@ -230,16 +230,14 @@ if ( ! empty( $messages ) ) {
 						$lang = '';
 					}
 
-					wp_dropdown_languages(
-						array(
-							'name'                        => 'WPLANG',
-							'id'                          => 'site-language',
-							'selected'                    => $lang,
-							'languages'                   => $languages,
-							'translations'                => $translations,
-							'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
-						)
-					);
+					wp_dropdown_languages( array(
+						'name'                        => 'WPLANG',
+						'id'                          => 'site-language',
+						'selected'                    => $lang,
+						'languages'                   => $languages,
+						'translations'                => $translations,
+						'show_available_translations' => current_user_can( 'install_languages' ),
+					) );
 					?>
 				</td>
 			</tr>

wp-admin/network/site-users.php

@@ -154,7 +154,7 @@ if ( $action ) {
 					// If the user doesn't already belong to the blog, bail.
 					if ( ! is_user_member_of_blog( $user_id ) ) {
 						wp_die(
-							'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
+							'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 							'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
 							403
 						);