<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17723] trunk/wp-content/themes/twentyeleven/inc/widgets.php: Twenty Eleven
: fix spacing and add a few missing esc_attr() calls in widgets.
php - see #17198</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17723">17723</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2011-04-27 04:45:11 +0000 (Wed, 27 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Eleven: fix spacing and add a few missing esc_attr() calls in widgets.php - see <a href="http://trac.wordpress.org/ticket/17198">#17198</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 (17722 => 17723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/widgets.php 2011-04-27 04:38:36 UTC (rev 17722)
+++ trunk/wp-content/themes/twentyeleven/inc/widgets.php 2011-04-27 04:45:11 UTC (rev 17723)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> add_action( 'save_post', array(&$this, 'flush_widget_cache' ) );
</span><span class="cx"> add_action( 'deleted_post', array(&$this, 'flush_widget_cache' ) );
</span><span class="cx"> add_action( 'switch_theme', array(&$this, 'flush_widget_cache' ) );
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -32,13 +31,13 @@
</span><span class="cx"> function widget( $args, $instance ) {
</span><span class="cx"> $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
</span><span class="cx">
</span><del>- if ( !is_array($cache) )
</del><ins>+ if ( !is_array( $cache ) )
</ins><span class="cx"> $cache = array();
</span><span class="cx">
</span><span class="cx"> if ( ! isset( $args['widget_id'] ) )
</span><span class="cx"> $args['widget_id'] = null;
</span><span class="cx">
</span><del>- if ( isset($cache[$args['widget_id']]) ) {
</del><ins>+ if ( isset( $cache[$args['widget_id']] ) ) {
</ins><span class="cx"> echo $cache[$args['widget_id']];
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -46,7 +45,7 @@
</span><span class="cx"> ob_start();
</span><span class="cx"> extract( $args, EXTR_SKIP );
</span><span class="cx">
</span><del>- $title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Ephemera' ) : $instance['title'], $instance, $this->id_base);
</del><ins>+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera' ) : $instance['title'], $instance, $this->id_base);
</ins><span class="cx">
</span><span class="cx"> if ( ! isset( $instance['number'] ) )
</span><span class="cx"> $instance['number'] = '10';
</span><span class="lines">@@ -133,12 +132,12 @@
</span><span class="cx"> **/
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="cx"> $instance = $old_instance;
</span><del>- $instance['title'] = strip_tags($new_instance['title']);
</del><ins>+ $instance['title'] = strip_tags( $new_instance['title'] );
</ins><span class="cx"> $instance['number'] = (int) $new_instance['number'];
</span><span class="cx"> $this->flush_widget_cache();
</span><span class="cx">
</span><span class="cx"> $alloptions = wp_cache_get( 'alloptions', 'options' );
</span><del>- if ( isset($alloptions['widget_twentyeleven_ephemera']) )
</del><ins>+ if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) )
</ins><span class="cx"> delete_option( 'widget_twentyeleven_ephemera' );
</span><span class="cx">
</span><span class="cx"> return $instance;
</span><span class="lines">@@ -152,14 +151,14 @@
</span><span class="cx"> * Displays the form for this widget on the Widgets page of the WP Admin area.
</span><span class="cx"> **/
</span><span class="cx"> function form( $instance ) {
</span><del>- $title = isset($instance['title']) ? esc_attr($instance['title']) : '';
- $number = isset($instance['number']) ? absint($instance['number']) : 10;
- ?>
- <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
- <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
</del><ins>+ $title = isset( $instance['title']) ? esc_attr( $instance['title'] ) : '';
+ $number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 10;
+?>
+ <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
+ <input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" /></p>
</ins><span class="cx">
</span><del>- <p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of posts to show:', 'twentyeleven' ); ?></label>
- <input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
</del><ins>+ <p><label for="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>"><?php _e( 'Number of posts to show:', 'twentyeleven' ); ?></label>
+ <input id="<?php echo esc_attr( $this->get_field_id( 'number' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'number' ) ); ?>" type="text" value="<?php echo esc_attr( $number ); ?>" size="3" /></p>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>