From 8040b247a435e0d64a60bd89d9ece4512de1cdbf Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 16 Jul 2018 13:30:26 +0000 Subject: [PATCH] Privacy: on the Privacy Settings screen change `view` to `preview` when a draft page is selected for the privacy policy. Props garrett-eclipse, desrosj. Merges [43374] to the 4.9 branch. Fixes #44131. Built from https://develop.svn.wordpress.org/branches/4.9@43453 git-svn-id: http://core.svn.wordpress.org/branches/4.9@43280 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/privacy.php | 9 +++++++-- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wp-admin/privacy.php b/wp-admin/privacy.php index 9c360dd18f..b9c5d8c181 100644 --- a/wp-admin/privacy.php +++ b/wp-admin/privacy.php @@ -155,8 +155,13 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );

Edit or view your privacy policy page content.' ), $edit_href, $view_href ); + if ( 'publish' === get_post_status( $privacy_policy_page_id ) ) { + /* translators: 1: URL to edit page, 2: URL to view page */ + printf( __( 'Edit or view your privacy policy page content.' ), $edit_href, $view_href ); + } else { + /* translators: 1: URL to edit page, 2: URL to preview page */ + printf( __( 'Edit or preview your privacy policy page content.' ), $edit_href, $view_href ); + } ?>

diff --git a/wp-includes/version.php b/wp-includes/version.php index 743a9563b9..ba5a4e5fee 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.8-alpha-43452'; +$wp_version = '4.9.8-alpha-43453'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.