WordPress.org
Get WordPress

Make WordPress Core

Changeset 12136


Ignore:
Timestamp:
11/02/2009 02:41:35 PM (15 years ago)
Author:
ryan
Message:

Switch oEmbed option to control discovery. Tweak whitelist and settings page. Props Viper007Bond. see #10337

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/includes/schema.php

    r12061 r12136  
    317317
    318318    // 2.9
    319     'embed_useoembed' => 1,
    320319    'embed_autourls' => 1,
     320    'embed_oembed_discover' => 1,
    321321    'embed_size_w' => '',
    322322    'embed_size_h' => 600,

  • trunk/wp-admin/options-media.php

    r12076 r12136  
    7878
    7979<tr valign="top">
    80 <th scope="row"><?php _e('oEmbed'); ?></th>
    81 <td><fieldset><legend class="screen-reader-text"><span><?php printf( __('Use <a href="%s">oEmbed</a> to assist in rich content embedding'), 'http://codex.wordpress.org/oEmbed' ); ?></span></legend>
    82 <label for="embed_useoembed"><input name="embed_useoembed" type="checkbox" id="embed_useoembed" value="1" <?php checked( '1', get_option('embed_useoembed') ); ?>/> <?php printf( __('Use <a href="%s">oEmbed</a> to allow embedding content from additional websites'), 'http://codex.wordpress.org/oEmbed' ); ?></label>
     80<th scope="row"><?php _e('oEmbed discovery'); ?></th>
     81<td><fieldset><legend class="screen-reader-text"><span><?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></span></legend>
     82<label for="embed_oembed_discover"><input name="embed_oembed_discover" type="checkbox" id="embed_oembed_discover" value="1" <?php checked( '1', get_option('embed_oembed_discover') ); ?>/> <?php printf( __('Attempt to embed content from unknown URLs using <a href="%s">oEmbed</a>'), 'http://codex.wordpress.org/Embeds#oEmbed' ); ?></label>
    8383</fieldset></td>
    8484</tr>
    8585
    8686<tr valign="top">
    87 <th scope="row"><?php _e('Embed size') ?></th>
     87<th scope="row"><?php _e('Maximum embed size') ?></th>
    8888<td>
    8989<label for="embed_size_w"><?php _e('Width'); ?></label>

  • trunk/wp-admin/options.php

    r12023 r12136  
    2626    'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
    2727    'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
    28     'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_useoembed', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
     28    'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_oembed_discover', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
    2929    'privacy' => array( 'blog_public' ),
    3030    'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),

  • trunk/wp-includes/class-oembed.php

    r12131 r12136  
    3838        // Add to this list using the wp_oembed_add_provider() function
    3939        $this->providers = apply_filters( 'oembed_providers', array(
    40             'http://www.youtube.com/watch*'   => array( 'http://www.youtube.com/oembed',            false  ),
    41             'http://blip.tv/file/*'           => array( 'http://blip.tv/oembed/',                   false ),
    42             '#http://(www\.)?vimeo\.com/.*#i' => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
    43             'http://*.flickr.com/*'           => array( 'http://www.flickr.com/services/oembed/',   false ),
    44             'http://www.hulu.com/watch/*'     => array( 'http://www.hulu.com/api/oembed.{format}',  false ),
    45             'http://*.viddler.com/*'          => array( 'http://lab.viddler.com/services/oembed/',  false ),
    46             'http://qik.com/*'                => array( 'http://qik.com/api/oembed.{format}',       false ),
    47             'http://revision3.com/*'          => array( 'http://revision3.com/api/oembed/',         false ),
    48             'http://i*.photobucket.com/albums/*' => array( 'http://photobucket.com/oembed',         false ),
    49             'http://gi*.photobucket.com/groups/*' => array( 'http://photobucket.com/oembed',        false ),
    50             'http://www.scribd.com/*'         => array( 'http://www.scribd.com/services/oembed',    false)
     40            '#http://(www\.)?youtube.com/watch.*#i' => array( 'http://www.youtube.com/oembed',            true  ),
     41            'http://blip.tv/file/*'                 => array( 'http://blip.tv/oembed/',                   false ),
     42            '#http://(www\.)?vimeo\.com/.*#i'       => array( 'http://www.vimeo.com/api/oembed.{format}', true  ),
     43            '#http://(www\.)?flickr.com/.*'         => array( 'http://www.flickr.com/services/oembed/',   true ),
     44            '#http://(www\.)?hulu.com/watch/.*#i'   => array( 'http://www.hulu.com/api/oembed.{format}',  true ),
     45            '#http://(www\.)?viddler.com/.*#i'      => array( 'http://lab.viddler.com/services/oembed/',  true ),
     46            'http://qik.com/*'                      => array( 'http://qik.com/api/oembed.{format}',       false ),
     47            'http://revision3.com/*'                => array( 'http://revision3.com/api/oembed/',         false ),
     48            'http://i*.photobucket.com/albums/*'    => array( 'http://photobucket.com/oembed',            false ),
     49            'http://gi*.photobucket.com/groups/*'   => array( 'http://photobucket.com/oembed',            false ),
     50            '#http://(www\.)?scribd.com/.*#i'       => array( 'http://www.scribd.com/services/oembed',    true)
    5151        ) );
    5252    }

  • trunk/wp-includes/media.php

    r12096 r12136  
    929929
    930930        // After a post is saved, cache oEmbed items via AJAX
    931         if ( get_option('embed_useoembed') )
    932             add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
     931        add_action( 'edit_form_advanced', array(&$this, 'maybe_run_ajax_cache') );
    933932    }
    934933
    … …  
    10601059
    10611060        // Unknown URL format. Let oEmbed have a go.
    1062         if ( $post_ID && get_option('embed_useoembed') ) {
     1061        if ( $post_ID ) {
    10631062
    10641063            // Check for a cached result (stored in the post meta)
    … …  
    10761075
    10771076            // Use oEmbed to get the HTML
    1078             $attr['discover'] = author_can( $post_ID, 'unfiltered_html' );
     1077            $attr['discover'] = ( get_option( 'embed_oembed_discover' ) && author_can( $post_ID, 'unfiltered_html' ) ) ? true : false;
    10791078            $html = wp_oembed_get( $url, $attr );
    10801079

  • trunk/wp-includes/version.php

    r12115 r12136  
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 12060;
     18$wp_db_version = 12136;
    1919
    2020/**
Note: See TracChangeset for help on using the changeset viewer.