HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Administration: Only warn about a Privacy Policy page collision when the page is set.

Browse Source 
Follow-up to [45766].

Props safedawn, OctoTooT, rollybueno, sabernhardt, SirLouen, dd32, SergeyBiryukov.
Fixes #60750.
Built from https://develop.svn.wordpress.org/trunk@61498


git-svn-id: http://core.svn.wordpress.org/trunk@60809 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
2026-01-19 17:03:13 +00:00
parent eacaa016d2
commit e0ea7a4cf7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/options-reading.php
View File

@@ -142,7 +142,9 @@ else :
</label></li>
</ul>
<?php
if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) === get_option( 'page_on_front' ) ) :
if ( 'page' === get_option( 'show_on_front' )
&& get_option( 'page_for_posts' ) === get_option( 'page_on_front' )
) :
wp_admin_notice(
__( '<strong>Warning:</strong> these pages should not be the same!' ),
array(
@@ -152,7 +154,13 @@ else :
)
);
endif;
if ( get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_for_posts' ) || get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_on_front' ) ) :
$privacy_policy_page = get_option( 'wp_page_for_privacy_policy' );
if ( $privacy_policy_page
&& ( get_option( 'page_for_posts' ) === $privacy_policy_page
|| get_option( 'page_on_front' ) === $privacy_policy_page )
) :
wp_admin_notice(
__( '<strong>Warning:</strong> these pages should not be the same as your Privacy Policy page!' ),
array(

2
wp-includes/version.php
View File

@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '7.0-alpha-61497';
$wp_version = '7.0-alpha-61498';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.