Changeset 36307 for trunk/src/wp-includes/embed.php

Timestamp:

01/15/2016 07:55:19 AM (5 years ago)

Author:

swissspidy

Message:

Embeds: Allow embedding static front pages and pages having a child page with an embed slug.

This makes embed a special slug that can't be used for new pages/posts. When https://example.com/foo/embed/ is an existing page, embeds fall back to https://example.com/foo/?embed=true.
Adds unit tests.

Fixes #34971.

File:

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

trunk/src/wp-includes/embed.php

@@ -346 +346 @@
     $output = '';
 
-    if ( is_singular() && ! is_front_page() ) {
+    if ( is_singular() ) {
         $output .= '<link rel="alternate" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
 
@@ -388 +388 @@
     }
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $embed_url = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( 'embed' );
-    } else {
+    $embed_url     = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( 'embed' );
+    $path_conflict = get_page_by_path( str_replace( home_url(), '', $embed_url ), OBJECT, get_post_types( array( 'public' => true ) ) );
+
+    if ( ! get_option( 'permalink_structure' ) || $path_conflict ) {
         $embed_url = add_query_arg( array( 'embed' => 'true' ), get_permalink( $post ) );
     }