Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: define $title and $parent_file in privacy.php. Fixes showing the proper document title.

Browse Source 
Props ocean90.
Merges [43250] to the 4.9 branch.
Fixes #44064.
Built from https://develop.svn.wordpress.org/branches/4.9@43252


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-14 13:54:24 +00:00
parent 39dcb61452
commit 4d5c5e90dd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/privacy.php
View File

@ -98,11 +98,14 @@ if ( ! empty( $privacy_policy_page_id ) ) {
} }
} }
$title = __( 'Privacy Settings' );
$parent_file = 'options-general.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' ); require_once( ABSPATH . 'wp-admin/admin-header.php' );
?> ?>
<div class="wrap"> <div class="wrap">
<h1><?php _e( 'Privacy Settings' ); ?></h1> <h1><?php echo $title; ?></h1>
<h2><?php _e( 'Privacy Policy page' ); ?></h2> <h2><?php _e( 'Privacy Policy page' ); ?></h2>
<p> <p>
<?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a privacy policy.' ); ?> <?php _e( 'As a website owner, you may need to follow national or international privacy laws. For example, you may need to create and display a privacy policy.' ); ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.6-RC1-43241'; $wp_version = '4.9.6-RC1-43252';
/** /**
* 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.