<!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>[25970] trunk/src/wp-content/themes/twentyfourteen: Twenty Fourteen: Fix gallery posts in the ephemera widget.</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/25970">25970</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-10-28 17:52:45 +0000 (Mon, 28 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Fourteen: Fix gallery posts in the ephemera widget. Props iamtakashi, fixes <a href="http://core.trac.wordpress.org/ticket/25740">#25740</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentgalleryphp">trunk/src/wp-content/themes/twentyfourteen/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincwidgetsphp">trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyfourteencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/content-gallery.php (25969 => 25970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2013-10-28 17:48:46 UTC (rev 25969)
+++ trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2013-10-28 17:52:45 UTC (rev 25970)
</span><span class="lines">@@ -6,34 +6,10 @@
</span><span class="cx"> * @subpackage Twenty_Fourteen
</span><span class="cx"> * @since Twenty Fourteen 1.0
</span><span class="cx"> */
</span><del>-
-if ( has_post_thumbnail() ) :
- $image = get_post_thumbnail_id();
-else :
- $images = get_posts( array(
- 'post_parent' => get_the_ID(),
- 'fields' => 'ids',
- 'numberposts' => 1,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID',
- ) );
- $image = array_shift( $images );
-endif;
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del>- <?php if ( is_single() && $image ) : ?>
- <div class="featured-thumbnail">
- <?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
- </div>
- <?php elseif ( $image ) : ?>
- <a class="featured-thumbnail" href="<?php the_permalink(); ?>" rel="<?php the_ID(); ?>">
- <?php echo wp_get_attachment_image( $image, 'featured-thumbnail-large' ); ?>
- </a>
- <?php endif; ?>
</del><ins>+ <?php twentyfourteen_post_thumbnail(); ?>
</ins><span class="cx">
</span><span class="cx"> <header class="entry-header">
</span><span class="cx"> <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php (25969 => 25970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2013-10-28 17:48:46 UTC (rev 25969)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2013-10-28 17:52:45 UTC (rev 25970)
</span><span class="lines">@@ -120,39 +120,66 @@
</span><span class="cx">
</span><span class="cx"> <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
</span><span class="cx"> <li>
</span><del>- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</del><ins>+ <article <?php post_class(); ?>>
</ins><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php
</span><span class="cx"> if ( has_post_format( 'gallery' ) ) :
</span><del>- $images = get_posts( array(
- 'post_parent' => get_post()->post_parent,
- 'fields' => 'ids',
- 'numberposts' => -1,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID'
- ) );
- $total_images = count( $images );
</del><span class="cx">
</span><del>- if ( has_post_thumbnail() ) :
- $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
- elseif ( $total_images > 0 ) :
- $image = array_shift( $images );
- $featured_image = wp_get_attachment_image( $image, 'featured-thumbnail-formatted' );
- endif;
</del><ins>+ if ( post_password_required() ) :
+ the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
+ else :
+ $images = array();
+
+ if ( function_exists( 'get_post_galleries' ) ) {
+ $galleries = get_post_galleries( get_the_ID(), false );
+ if ( isset( $galleries[0]['ids'] ) )
+ $images = explode( ',', $galleries[0]['ids'] );
+ } else {
+ $pattern = get_shortcode_regex();
+ preg_match( "/$pattern/s", get_the_content(), $match );
+ $atts = shortcode_parse_atts( $match[3] );
+ if ( isset( $atts['ids'] ) )
+ $images = explode( ',', $atts['ids'] );
+ }
+
+ if ( ! $images ) :
+ $images = get_posts( array(
+ 'fields' => 'ids',
+ 'numberposts' => 999,
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order',
+ 'post_mime_type' => 'image',
+ 'post_parent' => get_the_ID(),
+ 'post_type' => 'attachment',
+ ) );
+ endif;
+
+ $total_images = count( $images );
+
+ if ( has_post_thumbnail() ) :
+ $featured_image = get_the_post_thumbnail( get_the_ID(), 'featured-thumbnail-formatted' );
+ elseif ( $total_images > 0 ) :
+ $image = array_shift( $images );
+ $featured_image = wp_get_attachment_image( $image, 'featured-thumbnail-formatted' );
+ endif;
+
+ if ( ! empty ( $featured_image ) ) :
</ins><span class="cx"> ?>
</span><del>- <a href="<?php the_permalink(); ?>"><?php echo $featured_image; ?></a>
- <p class="wp-caption-text">
</del><ins>+ <a href="<?php the_permalink(); ?>"><?php echo $featured_image; ?></a>
+ <?php
+ endif;
+ ?>
+ <p class="wp-caption-text">
+ <?php
+ printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
+ esc_url( get_permalink() ),
+ number_format_i18n( $total_images )
+ );
+ ?>
+ </p>
</ins><span class="cx"> <?php
</span><del>- printf( _n( 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photo</a>.', 'This gallery contains <a href="%1$s" rel="bookmark">%2$s photos</a>.', $total_images, 'twentyfourteen' ),
- esc_url( get_permalink() ),
- number_format_i18n( $total_images )
- );
- ?>
- </p>
- <?php
</del><ins>+ endif;
+
</ins><span class="cx"> else :
</span><span class="cx"> the_content( __( 'Continue reading <span class="meta-nav">→</span>', 'twentyfourteen' ) );
</span><span class="cx"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>