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

Timestamp:

06/18/2015 12:11:30 AM (10 years ago)

Author:

azaozz

Message:

Press This: Check the embeds list against all of the oembed providers.
Props stephdau. Fixes #32069.

File:

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

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

@@ -445 +445 @@
         $src = $this->_limit_url( $src );
 
+        if ( empty( $src ) )
+            return '';
+
         if ( preg_match( '/\/\/(m|www)\.youtube\.com\/(embed|v)\/([^\?]+)\?.+$/', $src, $src_matches ) ) {
             // Embedded Youtube videos (www or mobile)
@@ -460 +463 @@
             // Embedded Daily Motion videos
             $src = 'https://www.dailymotion.com/video/' . $src_matches[2];
-        } else if ( ! preg_match( '/\/\/(m|www)\.youtube\.com\/watch\?/', $src )          // Youtube video page (www or mobile)
-                    && ! preg_match( '/\/youtu\.be\/.+$/', $src )                         // Youtu.be video page
-                    && ! preg_match( '/\/\/vimeo\.com\/[\d]+$/', $src )                   // Vimeo video page
-                    && ! preg_match( '/\/\/(www\.)?dailymotion\.com\/video\/.+$/', $src ) // Daily Motion video page
-                    && ! preg_match( '/\/\/soundcloud\.com\/.+$/', $src )                 // SoundCloud audio page
-                    && ! preg_match( '/\/\/twitter\.com\/[^\/]+\/status\/[\d]+$/', $src ) // Twitter status page
-                    && ! preg_match( '/\/\/vine\.co\/v\/[^\/]+/', $src ) ) {              // Vine video page
-            $src = '';
+        } else {
+            require_once( ABSPATH . WPINC . '/class-oembed.php' );
+            $oembed = _wp_oembed_get_object();
+
+            if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+                $src = '';
+            }
         }
 
@@ -934 +936 @@
         $selected_embeds = array();
 
+        // Make sure to add the Pressed page if it's a valid oembed itself
+        if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+            $data['_embeds'][] = $data['u'];
+        }
+
         if ( ! empty( $data['_embeds'] ) ) {
             foreach( $data['_embeds'] as $src ) {
@@ -1098 +1105 @@
         $default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
 
-        require_once( ABSPATH . WPINC . '/class-oembed.php' );
-        $oembed = _wp_oembed_get_object();
-
-        if ( ! empty( $data['u'] ) && $oembed->get_provider( $data['u'], array( 'discover' => false ) ) ) {
+        if ( $this->_limit_embed( $data['u'] ) ) {
             $default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';