<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24555] trunk/wp-includes/media.php: Remove some more post format functions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24555">24555</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-04 06:57:00 +0000 (Thu, 04 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some more post format functions.
props wonderboymusic. fixes <a href="http://core.trac.wordpress.org/ticket/24610">#24610</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (24554 => 24555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-07-03 22:36:13 UTC (rev 24554)
+++ trunk/wp-includes/media.php 2013-07-04 06:57:00 UTC (rev 24555)
</span><span class="lines">@@ -2023,110 +2023,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return suitable HTML code for output based on the content related to the global $post
- *
- * @since 3.6.0
- *
- * @param string $type Required. 'audio' or 'video'
- * @param WP_Post $post Optional. Used instead of global $post when passed.
- * @param int $limit Optional. The number of medias to extract if content is scanned.
- * @return string HTML for the media. Blank string if no media is found.
- */
-function get_the_post_format_media( $type, &$post = null, $limit = 0 ) {
- global $wp_embed;
-
- if ( empty( $post ) )
- $post = get_post();
-
- if ( empty( $post ) )
- return '';
-
- $cache_key = "media:{$type}";
-
- if ( isset( $post->format_content[ $cache_key ] ) )
- return $post->format_content[ $cache_key ];
-
- if ( ! isset( $post->format_content ) )
- $post->format_content = array();
-
- $count = 1;
-
- // these functions expect a reference, so we should make a copy of post content to avoid changing it
- $content = $post->post_content;
-
- $htmls = get_content_media( $type, $content, true, $limit );
- if ( ! empty( $htmls ) ) {
- $html = reset( $htmls );
- $post->format_content[ $cache_key ] = $html;
- return $post->format_content[ $cache_key ];
- }
-
- $embeds = get_embedded_media( $type, $content, 1 );
- if ( ! empty( $embeds ) ) {
- $embed = reset( $embeds );
- if ( 0 === strpos( $embed, 'http' ) ) {
- if ( strstr( $embed, home_url() ) ) {
-
- $format_content = '';
- $attr = array( 'src' => $embed );
-
- if ( 'audio' == $type )
- $format_content = wp_audio_shortcode( $attr );
- elseif ( 'video' == $type )
- $format_content = wp_video_shortcode( $attr );
-
- $post->format_content[ $cache_key ] = $format_content;
- } else {
- $post->format_content[ $cache_key ] = $wp_embed->autoembed( $embed );
- }
- } else {
- $post->format_content[ $cache_key ] = $embed;
- }
- return $post->format_content[ $cache_key ];
- }
-
- $medias = call_user_func( 'get_attached_' . $type, $post->ID );
- if ( ! empty( $medias ) ) {
- $media = reset( $medias );
- $url = wp_get_attachment_url( $media->ID );
-
- $format_content = '';
- $attr = array( 'src' => $url );
-
- if ( 'audio' == $type )
- $format_content = wp_audio_shortcode( $attr );
- elseif ( 'video' == $type )
- $format_content = wp_video_shortcode( $attr );
-
- $post->format_content[ $cache_key ] = $format_content;
- return $post->format_content[ $cache_key ];
- }
-
- return '';
-}
-
-/**
- * Output the first video in the current (@global) post's content
- *
- * @since 3.6.0
- *
- */
-function the_post_format_video() {
- $null = null;
- echo get_the_post_format_media( 'video', $null, 1 );
-}
-/**
- * Output the first audio in the current (@global) post's content
- *
- * @since 3.6.0
- *
- */
-function the_post_format_audio() {
- $null = null;
- echo get_the_post_format_media( 'audio', $null, 1 );
-}
-
-/**
</del><span class="cx"> * Retrieve images attached to the passed post
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span><span class="lines">@@ -2372,116 +2268,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return the first image in the current (@global) post's content
- *
- * @since 3.6.0
- *
- * @param string $attached_size If an attached image is found, the size to display it.
- * @param WP_Post $post Optional. Used instead of global $post when passed.
- * @return string HTML for the image. Blank string if no image is found.
- */
-function get_the_post_format_image( $attached_size = 'full', &$post = null ) {
- if ( empty( $post ) )
- $post = get_post();
-
- if ( empty( $post ) )
- return '';
-
- $cache_key = "image:{$attached_size}";
-
- if ( isset( $post->format_content[ $cache_key ] ) )
- return $post->format_content[ $cache_key ];
-
- if ( ! isset( $post->format_content ) )
- $post->format_content = array();
-
- $matched = false;
- $link_fmt = '%s';
-
- $medias = get_attached_images( $post->ID );
- if ( ! empty( $medias ) ) {
- $media = reset( $medias );
- $sizes = get_intermediate_image_sizes();
- $sizes[] = 'full'; // Add original image source.
-
- $urls = array();
- foreach ( $sizes as $size ) {
- $image = wp_get_attachment_image_src( $media->ID, $size );
- if ( $image )
- $urls[] = reset( $image );
- }
-
- // Add media permalink.
- $urls[] = get_attachment_link( $media->ID );
-
- $count = 1;
- $content = $post->post_content;
-
- if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
- foreach ( $matches as $shortcode ) {
- if ( 'caption' === $shortcode[2] ) {
- foreach ( $urls as $url ) {
- if ( strstr( $shortcode[0], $url ) ) {
- if ( ! $matched )
- $matched = do_shortcode_tag( $shortcode );
- }
- }
- }
- }
- }
-
- foreach ( array( 'a', 'img' ) as $tag ) {
- if ( preg_match_all( '#' . get_tag_regex( $tag ) . '#', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
- foreach ( $matches as $match ) {
- foreach ( $urls as $url ) {
- if ( strstr( $match[0], $url ) ) {
- if ( ! $matched )
- $matched = $match[0];
- }
- }
- }
- }
- }
-
- if ( ! $matched ) {
- $image = wp_get_attachment_image( $media->ID, $attached_size );
- $post->format_content[ $cache_key ] = sprintf( $link_fmt, $image );
- } else {
- $post->format_content[ $cache_key ] = $matched;
- if ( ! empty( $meta['url'] ) && false === stripos( $matched, '<a ' ) )
- $post->format_content[ $cache_key ] = sprintf( $link_fmt, $matched );
- }
- return $post->format_content[ $cache_key ];
- }
-
- $content = $post->post_content;
- $htmls = get_content_images( $content, true, 1 );
- if ( ! empty( $htmls ) ) {
- $html = reset( $htmls );
-
- $attachment_id = img_html_to_post_id( $html, $matched_html );
- if ( $attachment_id && $matched_html )
- $html = str_replace( $matched_html, wp_get_attachment_image( $attachment_id, $attached_size ), $html );
-
- $post->format_content[ $cache_key ] = sprintf( $link_fmt, $html );
- return $post->format_content[ $cache_key ];
- }
-
- return '';
-}
-
-/**
- * Output the first image in the current (@global) post's content
- *
- * @since 3.6.0
- *
- * @param string $attached_size If an attached image is found, the size to display it.
- */
-function the_post_format_image( $attached_size = 'full' ) {
- echo get_the_post_format_image( $attached_size );
-}
-
-/**
</del><span class="cx"> * Retrieve the attachment post id from HTML containing an image.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span></span></pre>
</div>
</div>
</body>
</html>