Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 07:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: Remove reinstated wp-admin/options-privacy.php from $_old_files.

Browse Source 
Fix WPCS violations in [45448].

See #43895.
Built from https://develop.svn.wordpress.org/trunk@45453


git-svn-id: http://core.svn.wordpress.org/trunk@45264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-05-27 02:40:53 +00:00
parent 2f7f0ad901
commit 96b4570781
5 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/includes/update-core.php
View File

@ -536,7 +536,6 @@ $_old_files = array(
'wp-admin/images/screenshots/twitter-embed-1.png', 'wp-admin/images/screenshots/twitter-embed-1.png',
'wp-admin/images/screenshots/twitter-embed-2.png', 'wp-admin/images/screenshots/twitter-embed-2.png',
'wp-admin/js/utils.js', 'wp-admin/js/utils.js',
'wp-admin/options-privacy.php',
'wp-app.php', 'wp-app.php',
'wp-includes/class-wp-atom-server.php', 'wp-includes/class-wp-atom-server.php',
'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css', 'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',

7
wp-admin/options-privacy.php
View File

@ -145,11 +145,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
); );
$view_href = get_permalink( $privacy_policy_page_id ); $view_href = get_permalink( $privacy_policy_page_id );
?> ?>
<p class="tools-privacy-edit"><strong> <p class="tools-privacy-edit"><strong>
<?php <?php
if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) { if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) {
printf( printf(
/* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page */ /* translators: 1: URL to edit Privacy Policy page, 2: URL to view Privacy Policy page */
@ -165,7 +163,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
esc_url( $view_href ) esc_url( $view_href )
); );
} }
?> ?>
</strong></p> </strong></p>
<?php <?php
@ -173,7 +170,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
?> ?>
<p> <p>
<?php <?php
printf( printf(
/* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */ /* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */
__( '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.' ), __( '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.' ),
@ -181,7 +177,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
'', '',
'' ''
); );
?> ?>
</p> </p>
@ -201,7 +196,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
</th> </th>
<td> <td>
<?php <?php
$has_pages = (bool) get_posts( $has_pages = (bool) get_posts(
array( array(
'post_type' => 'page', 'post_type' => 'page',
@ -218,7 +212,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="action" value="set-privacy-page" /> <input type="hidden" name="action" value="set-privacy-page" />
<?php <?php
wp_dropdown_pages( wp_dropdown_pages(
array( array(
'name' => 'page_for_privacy_policy', 'name' => 'page_for_privacy_policy',

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45452'; $wp_version = '5.3-alpha-45453';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.