<!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>[31265] trunk/src/wp-content/themes/twentyeleven: Twenty Eleven: fix escaping and minor code style issues.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31265">31265</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31265","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>lancewillett</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-22 00:41:36 +0000 (Thu, 22 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Eleven: fix escaping and minor code style issues. See <a href="https://core.trac.wordpress.org/ticket/29127">#29127</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyeleven404php">trunk/src/wp-content/themes/twentyeleven/404.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenauthorphp">trunk/src/wp-content/themes/twentyeleven/author.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentimagephp">trunk/src/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenfunctionsphp">trunk/src/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenimagephp">trunk/src/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincwidgetsphp">trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenshowcasephp">trunk/src/wp-content/themes/twentyeleven/showcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyeleven404php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/404.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/404.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/404.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: smilie */
</span><span class="cx" style="display: block; padding: 0 10px"> $archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- the_widget( 'WP_Widget_Archives', array('count' => 0 , 'dropdown' => 1 ), array( 'after_title' => '</h2>'.$archive_content ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ the_widget( 'WP_Widget_Archives', array( 'count' => 0, 'dropdown' => 1 ), array( 'after_title' => '</h2>' . $archive_content ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenauthorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/author.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/author.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/author.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="page-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyeleven' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyeleven' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> </header>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/content-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-image.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/content-image.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() && ! post_password_required() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comments-link">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php comments_popup_link( '<span class="leave-reply">' . __( "Reply", 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </header><!-- .entry-header -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/functions.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/functions.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,16 +330,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyeleven_admin_header_image() { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="headimg">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $color = get_header_textcolor();
- $image = get_header_image();
- if ( $color && $color != 'blank' )
- $style = ' style="color:#' . $color . '"';
- else
- $style = ' style="display:none"';
- ?>
- <h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
- <div id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
- <?php if ( $image ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $color = get_header_textcolor();
+ $image = get_header_image();
+ $style = 'display: none;';
+ if ( $color && $color != 'blank' ) {
+ $style = 'color: #' . $color . ';';
+ }
+ ?>
+ <h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+ <div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
+ <?php if ( $image ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $image ); ?>" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Main Sidebar', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-1',
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after_widget' => "</aside>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after_widget' => '</aside>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-2',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after_widget' => "</aside>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after_widget' => '</aside>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-3',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after_widget' => "</aside>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after_widget' => '</aside>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-4',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after_widget' => "</aside>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after_widget' => '</aside>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'sidebar-5',
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'before_widget' => '<aside id="%1$s" class="widget %2$s">',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after_widget' => "</aside>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after_widget' => '</aside>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'before_title' => '<h3 class="widget-title">',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after_title' => '</h3>',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -581,7 +581,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $class )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo 'class="' . $class . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo 'class="' . esc_attr( $class ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'twentyeleven_comment' ) ) :
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'get_post_galleries' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $galleries = get_post_galleries( get_the_ID(), false );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $galleries[0]['ids'] ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $images = explode( ',', $galleries[0]['ids'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $images = explode( ',', $galleries[0]['ids'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = get_shortcode_regex();
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( "/$pattern/s", get_the_content(), $match );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/header.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a page number if necessary:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_height = HEADER_IMAGE_HEIGHT;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo $header_image_height; ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end check for featured image or standard header ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // end check for removed header image ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/image.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/image.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> // or get the URL of the first image attachment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $next_attachment_url = get_attachment_link( $attachments[0]->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // or, if there's only 1 image, get the URL of the image
</span><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = wp_get_attachment_url();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_rtl() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default_theme_options['theme_layout'] = 'sidebar-content';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_theme_options['theme_layout'] = 'sidebar-content';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the Twenty Eleven default options.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" id="default-color-<?php echo esc_attr( $scheme['value'] ); ?>" value="<?php echo esc_attr( $scheme['default_link_color'] ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span>
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $scheme['thumbnail'] ); ?>" width="136" height="122" alt="" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo $scheme['label']; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $scheme['label'] ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr( $layout['value'] ); ?>" <?php checked( $options['theme_layout'], $layout['value'] ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <span>
</span><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" width="136" height="122" alt="" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo $layout['label']; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo esc_html( $layout['label'] ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +562,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $layouts = twentyeleven_layouts();
</span><span class="cx" style="display: block; padding: 0 10px"> $choices = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $layouts as $layout ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $choices[$layout['value']] = $layout['label'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $choices[ $layout['value'] ] = $layout['label'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize->add_control( 'twentyeleven_theme_options[theme_layout]', array(
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,9 +22,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->alt_option_name = 'widget_twentyeleven_ephemera';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'save_post', array(&$this, 'flush_widget_cache' ) );
- add_action( 'deleted_post', array(&$this, 'flush_widget_cache' ) );
- add_action( 'switch_theme', array(&$this, 'flush_widget_cache' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'save_post', array( &$this, 'flush_widget_cache' ) );
+ add_action( 'deleted_post', array( &$this, 'flush_widget_cache' ) );
+ add_action( 'switch_theme', array( &$this, 'flush_widget_cache' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,14 +38,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function widget( $args, $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !is_array( $cache ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_array( $cache ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $cache = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args['widget_id'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $args['widget_id'] = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $cache[$args['widget_id']] ) ) {
- echo $cache[$args['widget_id']];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $cache[ $args['widget_id'] ] ) ) {
+ echo $cache[ $args['widget_id'] ];
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,25 +53,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> extract( $args, EXTR_SKIP );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/default-widgets.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $instance['number'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['number'] = '10';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $number = absint( $instance['number'] ) )
- $number = 10;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $args['number'] = absint( $instance['number'] ) )
+ $args['number'] = 10;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'order' => 'DESC',
- 'posts_per_page' => $number,
- 'no_found_rows' => true,
- 'post_status' => 'publish',
- 'post__not_in' => get_option( 'sticky_posts' ),
- 'tax_query' => array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'order' => 'DESC',
+ 'posts_per_page' => $args['number'],
+ 'no_found_rows' => true,
+ 'post_status' => 'publish',
+ 'post__not_in' => get_option( 'sticky_posts' ),
+ 'tax_query' => array(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'post_format',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'terms' => array( 'post-format-aside', 'post-format-link', 'post-format-status', 'post-format-quote' ),
- 'field' => 'slug',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'terms' => array( 'post-format-aside', 'post-format-link', 'post-format-status', 'post-format-quote' ),
+ 'field' => 'slug',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'operator' => 'IN',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,10 +79,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera = new WP_Query( $ephemera_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ephemera->have_posts() ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $before_widget;
- echo $before_title;
- echo $title; // Can set this with a widget option, or omit altogether
- echo $after_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $args['before_widget'];
+ echo $args['before_title'];
+ echo $args['title'];
+ echo $args['after_title'];
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $after_widget;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $args['after_widget'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset the post globals as this query will have stomped on it
</span><span class="cx" style="display: block; padding: 0 10px"> wp_reset_postdata();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // end check for ephemeral posts
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cache[$args['widget_id']] = ob_get_flush();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache[ $args['widget_id'] ] = ob_get_flush();
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'widget_twentyeleven_ephemera', $cache, 'widget' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/showcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/showcase.php 2015-01-21 23:17:08 UTC (rev 31264)
+++ trunk/src/wp-content/themes/twentyeleven/showcase.php 2015-01-22 00:41:36 UTC (rev 31265)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <section class="featured-post <?php echo $feature_class; ?>" id="featured-post-<?php echo $counter_slider; ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <section class="featured-post <?php echo esc_attr( $feature_class ); ?>" id="featured-post-<?php echo esc_attr( $counter_slider ); ?>">
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,20 +135,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset the counter so that we end up with matching elements
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $counter_slider = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $counter_slider = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Begin from zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- rewind_posts();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ rewind_posts();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's roll again.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( $featured->have_posts() ) : $featured->the_post();
- $counter_slider++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( $featured->have_posts() ) : $featured->the_post();
+ $counter_slider++;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $counter_slider )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = 'class="active"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = ' class="active"';
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?>
- <li><a href="#featured-post-<?php echo $counter_slider; ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>" <?php echo $class; ?>></a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <li><a href="#featured-post-<?php echo esc_attr( $counter_slider ); ?>" title="<?php echo esc_attr( sprintf( __( 'Featuring: %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) ); ?>"<?php echo $class; ?>></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav>
</span></span></pre>
</div>
</div>
</body>
</html>