Ticket #31637: 31637.2.diff

src/wp-admin/includes/class-wp-press-this.php

@@ -926 +926 @@
                         $link = $data['_links']['shortlink'];
                 }
 
+                // If canonical link is from root (starts with /, but not //), as Vimeo.com does, be sure to fully qualify it.
+                // USe $data['u'] to define site root, because we know we force users to have them start with http[s].
+                if ( preg_match( '/^[\/]{1}[^\/]+/', $link ) ) {
+                        $link = preg_replace( '/^(https?:\/\/[^\/]+)(\/.*)?$/', '\1', $data['u'] ) . $link;
+                }
+
                 return $link;
         }
 
@@ -1001 +1007 @@
                                 ' <em><a href="%1$s">%2$s</a></em></p>',
                 );
 
+                $url = $this->get_canonical_link( $data );
+                $canonical_embed = $this->_limit_embed( $url );
+
+                // Try to auto-embed if on service-specific page
+                if ( ! empty( $canonical_embed ) ) {
+                        $default_html['quote'] = '[embed]' . $canonical_embed . '[/embed]<p>%1$s</p>';
+                }
+
                 /**
                  * Filter the default HTML for the Press This editor.
                  *
@@ -1019 +1033 @@
                 // Add source attribution if there is one available.
                 if ( ! empty( $default_html['link'] ) ) {
                         $title = $this->get_suggested_title( $data );
-                        $url = $this->get_canonical_link( $data );
 
                         if ( ! $title ) {
                                 $title = $this->get_source_site_name( $data );