Changeset 25686

Timestamp:

10/03/2013 03:50:26 AM (11 years ago)

Author:

nacin

Message:

Reset "Page on Front" when such a page is trashed.

props danielbachhuber.
fixes #24171.

File:

• trunk/src/wp-includes/post.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -2318 +2318 @@
     }
 
-    if ( 'page' == $post->post_type) {
-        // if the page is defined in option page_on_front or post_for_posts,
-        // adjust the corresponding options
-        if ( get_option('page_on_front') == $postid ) {
-            update_option('show_on_front', 'posts');
-            delete_option('page_on_front');
-        }
-        if ( get_option('page_for_posts') == $postid ) {
-            delete_option('page_for_posts');
-        }
-    } else {
-        unstick_post($postid);
-    }
-
     // Do raw query. wp_get_post_revisions() is filtered
     $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
@@ -2366 +2352 @@
     return $post;
 }
+
+/**
+ * Resets the page_on_front, show_on_front, and page_for_post settings when a
+ * linked page is deleted or trashed.
+ *
+ * Also ensures the post is no longer sticky.
+ *
+ * @access private
+ * @since 3.7.0
+ * @param $post_id
+ */
+function _reset_front_page_settings_for_post( $post_id ) {
+    $post = get_post( $post_id );
+    if ( 'page' == $post->post_type ) {
+        // If the page is defined in option page_on_front or post_for_posts,
+        // adjust the corresponding options
+        if ( get_option( 'page_on_front' ) == $post->ID ) {
+            update_option( 'show_on_front', 'posts' );
+            update_option( 'page_on_front', 0 );
+        }
+        if ( get_option( 'page_for_posts' ) == $post->ID ) {
+            delete_option( 'page_for_posts', 0 );
+        }
+    }
+    unstick_post( $post->ID );
+}
+add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
+add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
 
 /**