Changeset 31635

Timestamp:

03/06/2015 01:16:53 AM (12 years ago)

Author:

azaozz

Message:

PressThis:

• Fix error when checking for empty array keys.
• Add better DailyMotion embed support.

Props stephdau, see #31373.

File:

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

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

@@ -335 +335 @@
 
                 if ( is_numeric( $value ) || is_bool( $value ) ) {
-                        $return = (string) $value;
+                        $return = $value;
                 } else if ( is_string( $value ) ) {
                         if ( mb_strlen( $value ) > 5000 ) {
@@ -354 +354 @@
                         return '';
                 }
-                
+
                 $url = $this->_limit_string( $url );
 
@@ -420 +420 @@
                 } else if ( preg_match( '/\/\/vine\.co\/v\/([^\/]+)\/embed/', $src, $src_matches ) ) {
                         $src = 'https://vine.co/v/' . $src_matches[1];
+                } else if ( preg_match( '/\/\/(www\.)?dailymotion\.com\/embed\/video\/([^\/\?]+)([\/\?]{1}.+)?/', $src, $src_matches ) ) {
+                        $src = 'https://www.dailymotion.com/video/' . $src_matches[2];
                 } else if ( ! preg_match( '/\/\/(m\.|www\.)?youtube\.com\/watch\?/', $src )
                             && ! preg_match( '/\/youtu\.be\/.+$/', $src )
@@ -471 +473 @@
                         }
                 }
-                
+
                 return $data;
         }
@@ -638 +640 @@
 
                                         foreach ( $items as $key => $value ) {
-                                                $key = $this->_limit_string( wp_unslash( $key ) );
-
-                                                // Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
-                                                if ( empty( $key ) || strlen( $key ) > 100 ) {
-                                                        continue;
+                                                if ( ! is_numeric( $key ) ) {
+                                                        $key = $this->_limit_string( wp_unslash( $key ) );
+
+                                                        // Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
+                                                        if ( empty( $key ) || strlen( $key ) > 100 ) {
+                                                                continue;
+                                                        }
                                                 }