Changeset 21998 for trunk/wp-includes/media.php

Timestamp:

09/25/2012 07:10:09 AM (13 years ago)

Author:

nacin

Message:

Always attempt to embed URLs in content, removing the Auto-embeds (autoembed_urls) option.

Remove the UI for setting the default width and height for embeds. Width was confusing as it
was blank by default (inheriting the content width from the theme, or 500px). The height is
now calculated as 1.5x the content width, or 1000px, whichever is smaller.

The [embed] shortcode can still receive manual height and width attributes. This just removes
the global settings.

props wonderboymusic. see #21719.

File:

• trunk/wp-includes/media.php (modified) (7 diffs)

trunk/wp-includes/media.php

@@ -1082 +1082 @@
     function __construct() {
         // Hack to get the [embed] shortcode to run before wpautop()
-        add_filter( 'the_content', array(&$this, 'run_shortcode'), 8 );
+        add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
 
         // Shortcode placeholder for strip_shortcodes()
@@ -1088 +1088 @@
 
         // Attempts to embed all URLs in a post
-        if ( get_option('embed_autourls') )
-            add_filter( 'the_content', array(&$this, 'autoembed'), 8 );
+        add_filter( 'the_content', array( $this, 'autoembed' ), 8 );
 
         // After a post is saved, invalidate the oEmbed cache
-        add_action( 'save_post', array(&$this, 'delete_oembed_caches') );
+        add_action( 'save_post', array( $this, 'delete_oembed_caches' ) );
 
         // After a post is saved, cache oEmbed items via AJAX
-        add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
+        add_action( 'edit_form_advanced', array( $this, 'maybe_run_ajax_cache' ) );
     }
 
@@ -1120 +1119 @@
         remove_all_shortcodes();
 
-        add_shortcode( 'embed', array(&$this, 'shortcode') );
+        add_shortcode( 'embed', array( $this, 'shortcode' ) );
 
         // Do the shortcode (only the [embed] one is registered)
@@ -1294 +1293 @@
 
             $content = $this->run_shortcode( $post->post_content );
-            if ( get_option('embed_autourls') )
-                $this->autoembed( $content );
+            $this->autoembed( $content );
 
             $this->usecache = true;
@@ -1310 +1308 @@
      */
     function autoembed( $content ) {
-        return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array(&$this, 'autoembed_callback'), $content );
+        return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
     }
 
@@ -1368 +1366 @@
  * Create default array of embed parameters.
  *
+ * The width defaults to the content width as specified by the theme. If the
+ * theme does not specify a content width, then 500px is used.
+ *
+ * The default height is 1.5 times the width, or 1000px, whichever is smaller.
+ *
+ * The 'embed_defaults' filter can be used to adjust either of these values.
+ *
  * @since 2.9.0
  *
@@ -1373 +1378 @@
  */
 function wp_embed_defaults() {
-    if ( !empty($GLOBALS['content_width']) )
-        $theme_width = (int) $GLOBALS['content_width'];
-
-    $width = get_option('embed_size_w');
-
-    if ( empty($width) && !empty($theme_width) )
-        $width = $theme_width;
-
-    if ( empty($width) )
+    if ( ! empty( $GLOBALS['content_width'] ) )
+        $width = (int) $GLOBALS['content_width'];
+
+    if ( empty( $width ) )
         $width = 500;
 
-    $height = get_option('embed_size_h');
-
-    if ( empty($height) )
-        $height = 700;
-
-    return apply_filters( 'embed_defaults', array(
-        'width'  => $width,
-        'height' => $height,
-    ) );
+    $height = min( ceil( $width * 1.5 ), 1000 );
+
+    return apply_filters( 'embed_defaults', compact( 'width', 'height' ) );
 }