WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Privacy: On Privacy Settings screen, check if any pages exist before displaying the page selector. 

Props abdullahramzan, desrosj, melchoyce.
Merges [43238] to the 4.9 branch.
Fixes #43940.
Built from https://develop.svn.wordpress.org/branches/4.9@43239


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-10 21:41:26 +00:00
parent 843c263881
commit 1600aef2ab
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
wp-admin/privacy.php
View File

@ -167,32 +167,50 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
?> ?>
</th> </th>
<td> <td>
<form method="post" action=""> <?php
<label for="page_for_privacy_policy"> $has_pages = (bool) get_posts( array(
<?php _e( 'Either select an existing page:' ); ?> 'post_type' => 'page',
</label> 'posts_per_page' => 1,
<input type="hidden" name="action" value="set-privacy-page" /> 'post_status' => array(
<?php 'publish',
wp_dropdown_pages( 'draft',
array( ),
'name' => 'page_for_privacy_policy', ) );
'show_option_none' => __( '&mdash; Select &mdash;' ),
'option_none_value' => '0',
'selected' => $privacy_policy_page_id,
'post_status' => array( 'draft', 'publish' ),
)
);
wp_nonce_field( 'set-privacy-page' ); if ( $has_pages ) : ?>
<form method="post" action="">
<label for="page_for_privacy_policy">
<?php _e( 'Select an existing page:' ); ?>
</label>
<input type="hidden" name="action" value="set-privacy-page" />
<?php
wp_dropdown_pages(
array(
'name' => 'page_for_privacy_policy',
'show_option_none' => __( '&mdash; Select &mdash;' ),
'option_none_value' => '0',
'selected' => $privacy_policy_page_id,
'post_status' => array( 'draft', 'publish' ),
)
);
submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) ); wp_nonce_field( 'set-privacy-page' );
?>
</form> submit_button( __( 'Use This Page' ), 'primary', 'submit', false, array( 'id' => 'set-page' ) );
?>
</form>
<?php endif; ?>
<form method="post" action=""> <form method="post" action="">
<input type="hidden" name="action" value="create-privacy-page" /> <input type="hidden" name="action" value="create-privacy-page" />
<span> <span>
<?php _e( 'Or create a new page:' ); ?> <?php
if ( $has_pages ) {
_e( 'Or:' );
} else {
_e( 'There are no pages.' );
}
?>
</span> </span>
<?php <?php
wp_nonce_field( 'create-privacy-page' ); wp_nonce_field( 'create-privacy-page' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.6-beta1-43237'; $wp_version = '4.9.6-beta1-43239';
/** /**
* 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.