Changeset 22653 for trunk/wp-admin/includes/post.php

Timestamp:

11/19/2012 01:28:32 AM (12 years ago)

Author:

nacin

Message:

Revert page on front changes. Reverts [22127] [22129] [22135] [22136]. see #16379.

File:

• trunk/wp-admin/includes/post.php (modified) (4 diffs)

trunk/wp-admin/includes/post.php

@@ -1056 +1056 @@
  * @param string $new_title Optional. New title.
  * @param string $new_slug Optional. New slug.
- * @param string|WP_Screen $screen Optional. Screen where the editor is being shown.
  * @return string The HTML of the sample permalink slug editor.
  */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null, $screen = null ) {
+function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
     global $wpdb;
     $post = get_post($id);
 
     list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
-
-    if ( isset( $screen ) )
-        $screen = convert_to_screen( $screen );
-    else
-        $screen = get_current_screen();
 
     if ( 'publish' == get_post_status( $post ) ) {
@@ -1079 +1073 @@
 
     if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
-        if ( 'options-reading' == $screen->id )
-            return '';
         $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
         if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) )
             $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
-        if ( isset($view_post) )
+        if ( isset( $view_post ) )
             $return .= "<span id='view-post-btn'><a href='$permalink' class='button button-small'>$view_post</a></span>\n";
 
@@ -1109 +1101 @@
     $display_link = str_replace(array('%pagename%','%postname%'), $post_name_html, $permalink);
     $view_link = str_replace(array('%pagename%','%postname%'), $post_name, $permalink);
-    $return  = ( 'options-reading' == $screen->id ) ? __( 'Located at' ) . "\n" : '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+    $return =  '<strong>' . __('Permalink:') . "</strong>\n";
     $return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
     $return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
     $return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __('Edit') . "</a></span>\n";
     $return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
-    if ( isset( $view_post ) && 'options-reading' != $screen->id )
+    if ( isset($view_post) )
         $return .= "<span id='view-post-btn'><a href='$view_link' class='button button-small'>$view_post</a></span>\n";
 
@@ -1330 +1322 @@
     return $url;
 }
-
-/**
- * Creates new pages to be set as a front page or a page for posts in Reading Settings.
- *
- * @todo Make sure we are doing adequate sanitization on success, and cleanup/reset on failure.
- *
- * @since 3.5.0
- * @access private
- */
-function _show_on_front_reading_settings( $show_on_front_value ) {
-    // If we're not saving the Reading Settings screen, don't intercept.
-    if ( ! $_POST || ! strpos( wp_get_referer(), 'options-reading.php' ) )
-        return $show_on_front_value;
-
-    if ( 'posts' == $show_on_front_value ) {
-        update_option( 'page_on_front', 0 );
-        update_option( 'page_for_posts', 0 );
-        return $show_on_front_value;
-    }
-
-    // If a new front page was meant to be created, go forth and create it.
-    if ( 'new' == $_POST['page_on_front'] ) {
-
-        // If the user can't create pages, revert.
-        if ( ! current_user_can( 'create_posts', 'page' ) ) {
-            // If an existing page is set, keep things as is, rather than reverting to showing posts.
-            if ( get_option( 'page_on_front' ) ) {
-                $show_on_front_value = 'page';
-            } else {
-                $show_on_front_value = 'posts';
-                update_option( 'page_on_front', 0 );
-                update_option( 'page_for_posts', 0 );
-            }
-            add_settings_error( 'page_on_front', 'create_pages', __( 'You are not allowed to create pages on this site.' ) );
-            return $show_on_front_value;
-        }
-
-        $existing_page = get_page_by_title( stripslashes( $_POST['page_on_front_title'] ) );
-
-        // If page already exists and it's public, there's no need to create a new page.
-        if ( $existing_page && 'publish' == $existing_page->post_status ) {
-            $page_id = $existing_page->ID;
-        } else {
-            $page_id = wp_insert_post( array(
-                'post_title' => $_POST['page_on_front_title'],
-                'post_type' => 'page',
-                'post_status' => 'publish',
-                'comment_status' => 'closed',
-                'ping_status' => 'closed',
-                // @todo Create some sort of a 'context' in postmeta so we know we created a page through these means.
-                //       Consider then showing that context in the list table as a good-first-step.
-            ) );
-        }
-
-        if ( $page_id ) {
-            update_option( 'page_on_front', $page_id );
-        // If we can't save it, revert.
-        } elseif ( get_option( 'page_on_front' ) ) {
-            // If an existing page is set, keep things as is, rather than reverting to showing posts.
-            $show_on_front_value = 'page';
-        } else {
-            $show_on_front_value = 'posts';
-            update_option( 'page_on_front', 0 );
-            update_option( 'page_for_posts', 0 );
-            return $show_on_front_value;
-        }
-    } elseif ( $_POST['page_on_front'] ) {
-        update_option( 'page_on_front', $_POST['page_on_front'] );
-    } else {
-        // They didn't select a page at all. Sad face.
-        $show_on_front_value = 'posts';
-        update_option( 'page_on_front', 0 );
-        update_option( 'page_for_posts', 0 );
-        add_settings_error( 'page_on_front', 'no_page_selected', __( 'You must select a page to set a static front page.' ) );
-        return $show_on_front_value;
-    }
-
-    // If a page for posts was meant to be specified, update/create it.
-    if ( ! isset( $_POST['page_for_posts'] ) ) {
-        update_option( 'page_for_posts', 0 );
-        return $show_on_front_value;
-    }
-
-    $page_for_posts = (int) $_POST['page_for_posts'];
-
-    if ( ! $page_for_posts || ! $page = get_post( $page_for_posts, ARRAY_A ) ) {
-        update_option( 'page_for_posts', 0 );
-        return $show_on_front_value;
-    }
-
-    if ( 'page' != $page['post_type'] || ! current_user_can( 'edit_post', $page_for_posts ) ) {
-        update_option( 'page_for_posts', 0 );
-        return $show_on_front_value;
-    }
-
-    if ( 'publish' != $page['post_status'] && ! current_user_can( 'publish_post', $page_for_posts ) ) {
-        update_option( 'page_for_posts', 0 );
-        return $show_on_front_value;
-    }
-
-    $args = add_magic_quotes( $page );
-    $args['post_title']  = $_POST['page_for_posts_title'];
-    $args['post_name']   = $_POST['post_name'];
-    $args['post_status'] = 'publish';
-    if ( 'auto-draft' == $page['post_status'] ) {
-        $args['comment_status'] = 'closed';
-        $args['ping_status'] = 'closed';
-    }
-
-    $page_id = wp_insert_post( $args );
-    update_option( 'page_for_posts', $page_id );
-
-    return $show_on_front_value;
-}
-add_filter( 'sanitize_option_show_on_front', '_show_on_front_reading_settings' );