<!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>[28433] trunk/src/wp-includes/default-widgets.php: Eliminate use of `extract()` in `default-widgets.php`.</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/28433">28433</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-15 16:32:18 +0000 (Thu, 15 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `default-widgets.php`.
Props rzen, wonderboymusic.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultwidgetsphp">trunk/src/wp-includes/default-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-widgets.php (28432 => 28433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-widgets.php 2014-05-15 15:47:43 UTC (rev 28432)
+++ trunk/src/wp-includes/default-widgets.php 2014-05-15 16:32:18 UTC (rev 28433)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract( $args );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the widget title.
</span><span class="lines">@@ -54,16 +53,17 @@
</span><span class="cx"> 'exclude' => $exclude
</span><span class="cx"> ) ) );
</span><span class="cx">
</span><del>- if ( !empty( $out ) ) {
- echo $before_widget;
- if ( $title)
- echo $before_title . $title . $after_title;
</del><ins>+ if ( ! empty( $out ) ) {
+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php echo $out; ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args, EXTR_SKIP);
</del><span class="cx">
</span><span class="cx"> $show_description = isset($instance['description']) ? $instance['description'] : false;
</span><span class="cx"> $show_name = isset($instance['name']) ? $instance['name'] : false;
</span><span class="lines">@@ -130,7 +129,7 @@
</span><span class="cx"> $order = $orderby == 'rating' ? 'DESC' : 'ASC';
</span><span class="cx"> $limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
</span><span class="cx">
</span><del>- $before_widget = preg_replace('/id="[^"]*"/','id="%id"', $before_widget);
</del><ins>+ $before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the arguments for the Links widget.
</span><span class="lines">@@ -142,8 +141,8 @@
</span><span class="cx"> * @param array $args An array of arguments to retrieve the links list.
</span><span class="cx"> */
</span><span class="cx"> wp_list_bookmarks( apply_filters( 'widget_links_args', array(
</span><del>- 'title_before' => $before_title, 'title_after' => $after_title,
- 'category_before' => $before_widget, 'category_after' => $after_widget,
</del><ins>+ 'title_before' => $args['before_title'], 'title_after' => $args['after_title'],
+ 'category_before' => $before_widget, 'category_after' => $args['after_widget'],
</ins><span class="cx"> 'show_images' => $show_images, 'show_description' => $show_description,
</span><span class="cx"> 'show_name' => $show_name, 'show_rating' => $show_rating,
</span><span class="cx"> 'category' => $category, 'class' => 'linkcat widget',
</span><span class="lines">@@ -229,19 +228,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
</span><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx">
</span><span class="cx"> // Use current theme search form if it exists
</span><span class="cx"> get_search_form();
</span><span class="cx">
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function form( $instance ) {
</span><span class="lines">@@ -274,16 +273,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx"> $c = ! empty( $instance['count'] ) ? '1' : '0';
</span><span class="cx"> $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
</span><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><del>- $title = apply_filters( 'widget_title', empty($instance['title'] ) ? __( 'Archives' ) : $instance['title'], $instance, $this->id_base );
</del><ins>+ $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Archives' ) : $instance['title'], $instance, $this->id_base );
</ins><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx">
</span><span class="cx"> if ( $d ) {
</span><span class="cx"> ?>
</span><span class="lines">@@ -330,7 +329,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -374,14 +373,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Meta' ) : $instance['title'], $instance, $this->id_base );
</span><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php wp_register(); ?>
</span><span class="lines">@@ -406,7 +405,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -438,18 +437,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
</span><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx"> echo '<div id="calendar_wrap">';
</span><span class="cx"> get_calendar();
</span><span class="cx"> echo '</div>';
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -483,7 +482,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? '' : $instance['title'], $instance, $this->id_base );
</span><span class="lines">@@ -497,11 +495,13 @@
</span><span class="cx"> * @param WP_Widget $instance WP_Widget instance.
</span><span class="cx"> */
</span><span class="cx"> $text = apply_filters( 'widget_text', empty( $instance['text'] ) ? '' : $instance['text'], $instance );
</span><del>- echo $before_widget;
- if ( !empty( $title ) ) { echo $before_title . $title . $after_title; } ?>
</del><ins>+ echo $args['before_widget'];
+ if ( ! empty( $title ) ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ } ?>
</ins><span class="cx"> <div class="textwidget"><?php echo !empty( $instance['filter'] ) ? wpautop( $text ) : $text; ?></div>
</span><span class="cx"> <?php
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -543,7 +543,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract( $args );
</del><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Categories' ) : $instance['title'], $instance, $this->id_base );
</span><span class="lines">@@ -552,9 +551,10 @@
</span><span class="cx"> $h = ! empty( $instance['hierarchical'] ) ? '1' : '0';
</span><span class="cx"> $d = ! empty( $instance['dropdown'] ) ? '1' : '0';
</span><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx">
</span><span class="cx"> $cat_args = array('orderby' => 'name', 'show_count' => $c, 'hierarchical' => $h);
</span><span class="cx">
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -679,7 +679,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ob_start();
</span><del>- extract($args);
</del><span class="cx">
</span><span class="cx"> $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Posts' );
</span><span class="cx">
</span><span class="lines">@@ -709,8 +708,10 @@
</span><span class="cx">
</span><span class="cx"> if ($r->have_posts()) :
</span><span class="cx"> ?>
</span><del>- <?php echo $before_widget; ?>
- <?php if ( $title ) echo $before_title . $title . $after_title; ?>
</del><ins>+ <?php echo $args['before_widget']; ?>
+ <?php if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ } ?>
</ins><span class="cx"> <ul>
</span><span class="cx"> <?php while ( $r->have_posts() ) : $r->the_post(); ?>
</span><span class="cx"> <li>
</span><span class="lines">@@ -721,7 +722,7 @@
</span><span class="cx"> </li>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span><del>- <?php echo $after_widget; ?>
</del><ins>+ <?php echo $args['after_widget']; ?>
</ins><span class="cx"> <?php
</span><span class="cx"> // Reset the global $the_post as this query will have stomped on it
</span><span class="cx"> wp_reset_postdata();
</span><span class="lines">@@ -832,7 +833,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- extract($args, EXTR_SKIP);
</del><span class="cx"> $output = '';
</span><span class="cx">
</span><span class="cx"> $title = ( ! empty( $instance['title'] ) ) ? $instance['title'] : __( 'Recent Comments' );
</span><span class="lines">@@ -859,9 +859,10 @@
</span><span class="cx"> 'post_status' => 'publish'
</span><span class="cx"> ) ) );
</span><span class="cx">
</span><del>- $output .= $before_widget;
- if ( $title )
- $output .= $before_title . $title . $after_title;
</del><ins>+ $output .= $args['before_widget'];
+ if ( $title ) {
+ $output .= $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx">
</span><span class="cx"> $output .= '<ul id="recentcomments">';
</span><span class="cx"> if ( $comments ) {
</span><span class="lines">@@ -874,7 +875,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> $output .= '</ul>';
</span><del>- $output .= $after_widget;
</del><ins>+ $output .= $args['after_widget'];
</ins><span class="cx">
</span><span class="cx"> echo $output;
</span><span class="cx">
</span><span class="lines">@@ -1220,7 +1221,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function widget( $args, $instance ) {
</span><del>- extract($args);
</del><span class="cx"> $current_taxonomy = $this->_get_current_taxonomy($instance);
</span><span class="cx"> if ( !empty($instance['title']) ) {
</span><span class="cx"> $title = $instance['title'];
</span><span class="lines">@@ -1236,9 +1236,10 @@
</span><span class="cx"> /** This filter is documented in wp-includes/default-widgets.php */
</span><span class="cx"> $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
</span><span class="cx">
</span><del>- echo $before_widget;
- if ( $title )
- echo $before_title . $title . $after_title;
</del><ins>+ echo $args['before_widget'];
+ if ( $title ) {
+ echo $args['before_title'] . $title . $args['after_title'];
+ }
</ins><span class="cx"> echo '<div class="tagcloud">';
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1256,7 +1257,7 @@
</span><span class="cx"> ) ) );
</span><span class="cx">
</span><span class="cx"> echo "</div>\n";
</span><del>- echo $after_widget;
</del><ins>+ echo $args['after_widget'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="lines">@@ -1323,8 +1324,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><del>- $instance['title'] = strip_tags( stripslashes($new_instance['title']) );
- $instance['nav_menu'] = (int) $new_instance['nav_menu'];
</del><ins>+ $instance = array();
+ if ( ! empty( $new_instance['title'] ) ) {
+ $instance['title'] = strip_tags( stripslashes($new_instance['title']) );
+ }
+ if ( ! empty( $new_instance['nav_menu'] ) ) {
+ $instance['nav_menu'] = (int) $new_instance['nav_menu'];
+ }
</ins><span class="cx"> return $instance;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>