Ticket #23620: 23620.2.diff

wp-content/themes/twentythirteen/functions.php

@@ -436 +436 @@
         return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
 }
 
+/**
+ * Finds first video from a given post.
+ *
+ * 1. Tries for a video source element in post content.
+ * 2. Tries for a video embed in post content.
+ * 3. Tries for an attached video.
+ *
+ * @param object $post
+ * @return array First node in just video URL, second node is the rest of the content.
+ */
+function twentythirteen_get_video_content() {
+        $post_content = get_the_content();
+
+        $content_video = get_content_video( $post_content, true );
+        
+        if ( empty( $content_video ) ) {
+                $content_video = get_embedded_video( $post_content, true );
+
+                if ( empty( $content_video ) )
+                        $content_video = get_attached_video( get_the_ID() );
+        }
+
+        return array(
+                $content_video[0],
+                $post_content
+        );
+}
+
 if ( ! function_exists( 'twentythirteen_featured_gallery' ) ) :
 /**
  * Displays first gallery from post content. Changes image size from thumbnail
@@ -574 +602 @@
 /**
  * Adds support for a custom header image.
  */
-require( get_template_directory() . '/inc/custom-header.php' );
+require( get_template_directory() . '/inc/custom-header.php' );
+ No newline at end of file

wp-content/themes/twentythirteen/content-video.php

@@ -10 +10 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
         <header class="entry-header">
+                <?php
+                        $content_pieces = twentythirteen_get_video_content();
+                        echo $content_pieces[0];
+                ?>
+
                 <?php if ( is_single() ) : ?>
                 <h1 class="entry-title"><?php the_title(); ?></h1>
                 <?php else : ?>
@@ -20 +25 @@
         </header><!-- .entry-header -->
 
         <div class="entry-content">
-                <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+                <?php echo $content_pieces[1]; ?>
                 <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
         </div><!-- .entry-content -->