<!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>[19308] trunk/wp-content/themes/twentyeleven/inc/widgets.php: Indent code within an inside Twenty Eleven's 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, #logmsg > ol { margin-left: 0; 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/19308">19308</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-11-16 00:08:29 +0000 (Wed, 16 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Indent code within an inside Twenty Eleven's ephemera widget. props lloydbudd, fixes <a href="http://core.trac.wordpress.org/ticket/18751">#18751</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenincwidgetsphp">trunk/wp-content/themes/twentyeleven/inc/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenincwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/widgets.php (19307 => 19308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/widgets.php 2011-11-15 21:58:42 UTC (rev 19307)
+++ trunk/wp-content/themes/twentyeleven/inc/widgets.php 2011-11-16 00:08:29 UTC (rev 19308)
</span><span class="lines">@@ -75,52 +75,50 @@
</span><span class="cx"> $ephemera = new WP_Query( $ephemera_args );
</span><span class="cx">
</span><span class="cx"> if ( $ephemera->have_posts() ) :
</span><ins>+ echo $before_widget;
+ echo $before_title;
+ echo $title; // Can set this with a widget option, or omit altogether
+ echo $after_title;
+ ?>
+ <ol>
+ <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
</ins><span class="cx">
</span><del>- echo $before_widget;
- echo $before_title;
- echo $title; // Can set this with a widget option, or omit altogether
- echo $after_title;
</del><ins>+ <?php if ( 'link' != get_post_format() ) : ?>
</ins><span class="cx">
</span><del>- ?>
- <ol>
- <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
</del><ins>+ <li class="widget-entry-title">
+ <a href="<?php echo esc_url( get_permalink() ); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
+ <span class="comments-link">
+ <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+ </span>
+ </li>
</ins><span class="cx">
</span><del>- <?php if ( 'link' != get_post_format() ) : ?>
</del><ins>+ <?php else : ?>
</ins><span class="cx">
</span><del>- <li class="widget-entry-title">
- <a href="<?php echo esc_url( get_permalink() ); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
- <span class="comments-link">
- <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
- </span>
- </li>
</del><ins>+ <li class="widget-entry-title">
+ <?php
+ // Grab first link from the post content. If none found, use the post permalink as fallback.
+ $link_url = twentyeleven_url_grabber();
</ins><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ if ( empty( $link_url ) )
+ $link_url = get_permalink();
+ ?>
+ <a href="<?php echo esc_url( $link_url ); ?>" title="<?php printf( esc_attr__( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
+ <span class="comments-link">
+ <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+ </span>
+ </li>
</ins><span class="cx">
</span><del>- <li class="widget-entry-title">
- <?php
- // Grab first link from the post content. If none found, use the post permalink as fallback.
- $link_url = twentyeleven_url_grabber();
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><del>- if ( empty( $link_url ) )
- $link_url = get_permalink();
- ?>
- <a href="<?php echo esc_url( $link_url ); ?>" title="<?php printf( esc_attr__( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
- <span class="comments-link">
- <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
- </span>
- </li>
</del><ins>+ <?php endwhile; ?>
+ </ol>
+ <?php
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><ins>+ echo $after_widget;
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
- </ol>
- <?php
</del><ins>+ // Reset the post globals as this query will have stomped on it
+ wp_reset_postdata();
</ins><span class="cx">
</span><del>- echo $after_widget;
-
- // Reset the post globals as this query will have stomped on it
- wp_reset_postdata();
-
</del><span class="cx"> // end check for ephemeral posts
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>