summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorWeston Ruter <westonruter@git.wordpress.org>2016-10-30 20:20:54 +0000
committerWeston Ruter <westonruter@git.wordpress.org>2016-10-30 20:20:54 +0000
commit4de2e30bb4527ff29d4b55e39eaa2ba5dd4f64e5 (patch)
tree659c3589148041c597d834121f0affd0d710373b /src
parent32c7696700acc740b28d8b91d8711f6a37345ecd (diff)
downloadwordpress-4de2e30bb4527ff29d4b55e39eaa2ba5dd4f64e5.tar.gz
wordpress-4de2e30bb4527ff29d4b55e39eaa2ba5dd4f64e5.zip
Customize: Prevent auto-draft post/page stubs from being saved with empty slugs or published with non-unique slugs.
* Allow `WP_Customize_Nav_Menus::insert_auto_draft_post()` to take full post array to pass to `wp_insert_post()`, except for `post_status`. Require `post_title`. * Ensure empty `post_name` gets explicitly set to slugified `post_title`. * Explicitly allow only `post_type` and `post_title` params in `WP_Customize_Nav_Menus::ajax_insert_auto_draft_post()`. * Use `wp_update_post()` instead of `wp_publish_post()` to ensure unique slugs are assigned to published auto-draft posts. * Re-use `WP_Customize_Nav_Menus::insert_auto_draft_post()` when inserting stubs from starter content. See #38114, #38013, #34923. Fixes #38539. git-svn-id: https://develop.svn.wordpress.org/trunk@39038 602fd350-edb4-49c9-b593-d223f7449a82
Diffstat (limited to 'src')
-rw-r--r--src/wp-includes/class-wp-customize-manager.php8
-rw-r--r--src/wp-includes/class-wp-customize-nav-menus.php52
2 files changed, 35 insertions, 25 deletions
diff --git a/src/wp-includes/class-wp-customize-manager.php b/src/wp-includes/class-wp-customize-manager.php
index 4862de4525..f96a220349 100644
--- a/src/wp-includes/class-wp-customize-manager.php
+++ b/src/wp-includes/class-wp-customize-manager.php
@@ -959,10 +959,10 @@ final class WP_Customize_Manager {
// Posts & pages.
if ( ! empty( $posts ) ) {
foreach ( array_keys( $posts ) as $post_symbol ) {
- $posts[ $post_symbol ]['ID'] = wp_insert_post( wp_slash( array_merge(
- $posts[ $post_symbol ],
- array( 'post_status' => 'auto-draft' )
- ) ) );
+ $r = $this->nav_menus->insert_auto_draft_post( $posts[ $post_symbol ] );
+ if ( $r instanceof WP_Post ) {
+ $posts[ $post_symbol ]['ID'] = $r->ID;
+ }
}
$this->set_post_value( 'nav_menus_created_posts', wp_list_pluck( $posts, 'ID' ) ); // This is why nav_menus component is dependency for adding posts.
}
diff --git a/src/wp-includes/class-wp-customize-nav-menus.php b/src/wp-includes/class-wp-customize-nav-menus.php
index ec60c2f344..66dd4660a5 100644
--- a/src/wp-includes/class-wp-customize-nav-menus.php
+++ b/src/wp-includes/class-wp-customize-nav-menus.php
@@ -734,10 +734,12 @@ final class WP_Customize_Nav_Menus {
* @since 4.7.0
*
* @param array $postarr {
- * Abbreviated post array.
+ * Post array. Note that post_status is overridden to be `auto-draft`.
*
- * @var string $post_title Post title.
- * @var string $post_type Post type.
+ * @var string $post_title Post title. Required.
+ * @var string $post_type Post type. Required.
+ * @var string $post_name Post name.
+ * @var string $post_content Post content.
* }
* @return WP_Post|WP_Error Inserted auto-draft post object or error.
*/
@@ -745,18 +747,22 @@ final class WP_Customize_Nav_Menus {
if ( ! isset( $postarr['post_type'] ) || ! post_type_exists( $postarr['post_type'] ) ) {
return new WP_Error( 'unknown_post_type', __( 'Unknown post type' ) );
}
- if ( ! isset( $postarr['post_title'] ) ) {
- $postarr['post_title'] = '';
+ if ( empty( $postarr['post_title'] ) ) {
+ return new WP_Error( 'empty_title', __( 'Empty title' ) );
+ }
+ if ( ! empty( $postarr['post_status'] ) ) {
+ return new WP_Error( 'status_forbidden', __( 'Status is forbidden' ) );
+ }
+
+ $postarr['post_status'] = 'auto-draft';
+
+ // Auto-drafts are allowed to have empty post_names, so it has to be explicitly set.
+ if ( empty( $postarr['post_name'] ) ) {
+ $postarr['post_name'] = sanitize_title( $postarr['post_title'] );
}
add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
- $args = array(
- 'post_status' => 'auto-draft',
- 'post_type' => $postarr['post_type'],
- 'post_title' => $postarr['post_title'],
- 'post_name' => sanitize_title( $postarr['post_title'] ), // Auto-drafts are allowed to have empty post_names, so we need to explicitly set it.
- );
- $r = wp_insert_post( wp_slash( $args ), true );
+ $r = wp_insert_post( wp_slash( $postarr ), true );
remove_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
if ( is_wp_error( $r ) ) {
@@ -785,15 +791,18 @@ final class WP_Customize_Nav_Menus {
wp_send_json_error( 'missing_params', 400 );
}
- $params = wp_array_slice_assoc(
- array_merge(
- array(
- 'post_type' => '',
- 'post_title' => '',
- ),
- wp_unslash( $_POST['params'] )
+ $params = wp_unslash( $_POST['params'] );
+ $illegal_params = array_diff( array_keys( $params ), array( 'post_type', 'post_title' ) );
+ if ( ! empty( $illegal_params ) ) {
+ wp_send_json_error( 'illegal_params', 400 );
+ }
+
+ $params = array_merge(
+ array(
+ 'post_type' => '',
+ 'post_title' => '',
),
- array( 'post_type', 'post_title' )
+ $params
);
if ( empty( $params['post_type'] ) || ! post_type_exists( $params['post_type'] ) ) {
@@ -1139,7 +1148,8 @@ final class WP_Customize_Nav_Menus {
$post_ids = $setting->post_value();
if ( ! empty( $post_ids ) ) {
foreach ( $post_ids as $post_id ) {
- wp_publish_post( $post_id );
+ // Note that wp_publish_post() cannot be used because unique slugs need to be assigned.
+ wp_update_post( array( 'ID' => $post_id, 'post_status' => 'publish' ) );
}
}
}