Changeset 31827

Timestamp:

03/19/2015 12:51:43 AM (10 years ago)

Author:

azaozz

Message:

Press This: check if the URL is to embeddable content on a site that supports oEmbed. Then insert only the URL in the editor. It will trigger a wpView with the embedded content.
Fixes #31637.

File:

• trunk/src/wp-admin/includes/class-wp-press-this.php (modified) (5 diffs)

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

@@ -779 +779 @@
                 <button type="button" class="add-cat-submit"><?php _e( 'Add' ); ?></button>
             </div>
-        <?php } ?>
+            <?php
+
+        }
+        ?>
         <div class="categories-search-wrapper">
             <input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e( 'Search categories by name' ) ?>">
@@ -810 +813 @@
             $esc_tags = '';
         }
+
         ?>
         <div class="tagsdiv" id="post_tag">
             <div class="jaxtag">
             <input type="hidden" name="tax_input[post_tag]" class="the-tags" value="<?php echo $esc_tags; // escaped in get_terms_to_edit() ?>">
-
             <?php
+
             if ( $user_can_assign_terms ) {
                 ?>
@@ -828 +832 @@
                     <?php echo $taxonomy->labels->separate_items_with_commas; ?>
                 </p>
-            <?php } ?>
+                <?php
+            }
+
+            ?>
             </div>
             <div class="tagchecklist"></div>
         </div>
         <?php
+
         if ( $user_can_assign_terms ) {
             ?>
@@ -995 +1003 @@
         }
 
-        $default_html = array(
-            'quote' => '<blockquote>%1$s</blockquote>',
-            'link' => '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
-                ' <em><a href="%1$s">%2$s</a></em></p>',
-        );
+        require_once( ABSPATH . WPINC . '/class-oembed.php' );
+        $oembed = _wp_oembed_get_object();
+
+        if ( ! empty( $data['u'] ) && $oembed->get_provider( $data['u'], array( 'discover' => false ) ) ) {
+            $default_html = array(
+                'quote' => '',
+                'link' => '',
+                'embed' => '<p>[embed]' . $data['u'] . '[/embed]</p>',
+            );
+        } else {
+            $default_html = array(
+                'quote' => '<blockquote>%1$s</blockquote>',
+                'link' => '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+                    ' <em><a href="%1$s">%2$s</a></em></p>',
+            );
+        }
 
         /**
@@ -1011 +1030 @@
         $default_html = apply_filters( 'press_this_suggested_html', $default_html, $data );
 
+        if ( ! empty( $default_html['embed'] ) ) {
+            $content .= $default_html['embed'];
+        }
+
         // Wrap suggested content in the specified HTML.
         if ( ! empty( $default_html['quote'] ) ) {
-            $content = sprintf( $default_html['quote'], $text );
+            $content .= sprintf( $default_html['quote'], $text );
         }