Changeset 28874

Timestamp:

06/28/2014 02:12:19 AM (10 years ago)

Author:

wonderboymusic

Message:

Perform a canonical redirect for posts that are published but are visited at a ?p=123&preview=true URL.

Props amit, joostdevalk.
Fixes #20496.

File:

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

trunk/src/wp-includes/canonical.php

@@ -40 +40 @@
     global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
 
+    // If we're not in wp-admin and the post has been published and preview nonce
+    // is non-existant or invalid then no need for preview in query
+    if ( is_preview() && get_query_var( 'p' ) && 'publish' == get_post_status( get_query_var( 'p' ) ) ) {
+        if ( ! isset( $_GET['preview_id'] )
+            || ! isset( $_GET['preview_nonce'] )
+            || ! wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . (int) $_GET['preview_id'] ) ) {
+            $wp_query->is_preview = false;
+        }
+    }
+
     if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) )
         return;
@@ -68 +78 @@
     if ( !isset($redirect['query']) )
         $redirect['query'] = '';
+
+    // If its not a preview then remove it from URL
+    if ( ! is_preview() ) {
+        $redirect['query'] = remove_query_arg( 'preview', $redirect['query'] );
+    }
 
     if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {