<!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>[BuddyPress][9724] trunk/src/bp-members/bp-members-widgets.php: Members: Improvements to `BP_Core_Members_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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9724">9724</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9724","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-09 19:04:18 +0000 (Thu, 09 Apr 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'>Members: Improvements to `BP_Core_Members_Widget`

* Escape gettext output
* Yoda conditions
* Do not check nonce referrer to prevent collisions with other referrer nonces
* Add missing semicolons after PHP execution
* Introduce `parse_settings()` method for setting smart default values
* Remove `extract()` usages
* Code formatting improvements

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6361">#6361</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmemberswidgetsphp">trunk/src/bp-members/bp-members-widgets.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmemberswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/bp-members-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-widgets.php       2015-04-09 15:31:18 UTC (rev 9723)
+++ trunk/src/bp-members/bp-members-widgets.php 2015-04-09 19:04:18 UTC (rev 9724)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,9 +16,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @since BuddyPress (2.2.0)
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_members_register_widgets() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Members_Widget");') );
-       add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Whos_Online_Widget");') );
-       add_action('widgets_init', create_function('', 'return register_widget("BP_Core_Recently_Active_Widget");') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'widgets_init', create_function( '', 'return register_widget("BP_Core_Members_Widget");'         ) );
+       add_action( 'widgets_init', create_function( '', 'return register_widget("BP_Core_Whos_Online_Widget");'     ) );
+       add_action( 'widgets_init', create_function( '', 'return register_widget("BP_Core_Recently_Active_Widget");' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_register_widgets', 'bp_members_register_widgets' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,16 +30,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Core_Members_Widget extends WP_Widget {
</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">-         * Constructor method.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Constructor method
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function __construct() {
-               $widget_ops = array(
-                       'description' => __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' ),
-                       'classname' => 'widget_bp_core_members_widget buddypress widget',
-               );
-               parent::__construct( false, $name = _x( '(BuddyPress) Members', 'widget name', 'buddypress' ), $widget_ops );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct() {
</ins><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_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Setup widget name & description
+               $name        = _x( '(BuddyPress) Members', 'widget name', 'buddypress' );
+               $description = __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' );
+
+               // Call WP_Widget constructor
+               parent::__construct( false, $name, array(
+                       'description' => $description,
+                       'classname'   => 'widget_bp_core_members_widget buddypress widget',
+               ) );
+
+               // Maybe enqueue JS for widget
+               if ( is_active_widget( false, false, $this->id_base ) && ! is_admin() && ! is_network_admin() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_enqueue_script( 'bp-widget-members' );
</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">@@ -52,12 +58,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $args Widget arguments.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $instance Widget settings, as saved by the user.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function widget( $args, $instance ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function widget( $args, $instance ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                extract( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get widget settings
+               $settings = $this->parse_settings( $instance );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( !$instance['member_default'] )
-                       $instance['member_default'] = 'active';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Output any content before the widget
+               echo $args['before_widget'];
</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">                 * Filters the title of the Members widget.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,81 +73,82 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @since BuddyPress (2.3.0) Added 'instance' and 'id_base' to arguments passed to filter.
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param string $title    The widget title.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param array  $instance The settings for the particular instance of the widget.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param array  $settings The settings for the particular instance of the widget.
</ins><span class="cx" style="display: block; padding: 0 10px">                  * @param string $id_base  Root ID for all widgets of this type.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $title = apply_filters( 'widget_title', $settings['title'], $settings, $this->id_base );
+               $title = $settings['link_title'] ? '<a href="' . bp_get_members_directory_permalink() . '">' . $title . '</a>' : $title;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                echo $before_widget;
-
-               $title = $instance['link_title'] ? '<a href="' . bp_get_members_directory_permalink() . '">' . $title . '</a>' : $title;
-
-               echo $before_title
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Output title (and maybe content before & after it)
+               echo $args['before_title']
</ins><span class="cx" style="display: block; padding: 0 10px">                    . $title
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                   . $after_title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+            . $args['after_title'];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Setup args for querying members
</ins><span class="cx" style="display: block; padding: 0 10px">                 $members_args = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'user_id'         => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'type'            => $instance['member_default'],
-                       'per_page'        => $instance['max_members'],
-                       'max'             => $instance['max_members'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'type'            => $settings['member_default'],
+                       'per_page'        => $settings['max_members'],
+                       'max'             => $settings['max_members'],
</ins><span class="cx" style="display: block; padding: 0 10px">                         'populate_extras' => true,
</span><span class="cx" style="display: block; padding: 0 10px">                        'search_terms'    => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php if ( bp_has_members( $members_args ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php if ( bp_has_members( $members_args ) ) : ?>
</del><span class="cx" style="display: block; padding: 0 10px">                         <div class="item-options" id="members-list-options">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <a href="<?php bp_members_directory_permalink(); ?>" id="newest-members" <?php if ( $instance['member_default'] == 'newest' ) : ?>class="selected"<?php endif; ?>><?php _e( 'Newest', 'buddypress' ) ?></a>
-                               |  <a href="<?php bp_members_directory_permalink(); ?>" id="recently-active-members" <?php if ( $instance['member_default'] == 'active' ) : ?>class="selected"<?php endif; ?>><?php _e( 'Active', 'buddypress' ) ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <a href="<?php bp_members_directory_permalink(); ?>" id="newest-members" <?php if ( 'newest' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Newest', 'buddypress' ); ?></a>
+                               |  <a href="<?php bp_members_directory_permalink(); ?>" id="recently-active-members" <?php if ( 'active' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Active', 'buddypress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        | <a href="<?php bp_members_directory_permalink(); ?>" id="popular-members" <?php if ( $instance['member_default'] == 'popular' ) : ?>class="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 | <a href="<?php bp_members_directory_permalink(); ?>" id="popular-members" <?php if ( 'popular' === $settings['member_default'] ) : ?>class="selected"<?php endif; ?>><?php esc_html_e( 'Popular', 'buddypress' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endif; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <ul id="members-list" class="item-list">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <?php while ( bp_members() ) : bp_the_member(); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <li class="vcard">
</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="item-avatar">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_avatar() ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name(); ?>"><?php bp_member_avatar(); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                                <div class="item">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        <div class="item-title fn"><a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_name() ?></a></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 <div class="item-title fn"><a href="<?php bp_member_permalink(); ?>" title="<?php bp_member_name(); ?>"><?php bp_member_name(); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         <div class="item-meta">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                <span class="activity">
-                                                               <?php
-                                                                       if ( 'newest' == $instance['member_default'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                         <span class="activity"><?php
+                                                                       if ( 'newest' === $settings['member_default'] ) :
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                                 bp_member_registered();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        if ( 'active' == $instance['member_default'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 elseif ( 'active' === $settings['member_default'] ) :
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                                 bp_member_last_active();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                        if ( 'popular' == $instance['member_default'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 elseif ( 'popular' === $settings['member_default'] ) :
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                                 bp_member_total_friend_count();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                                ?>
-                                                               </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                                 endif; ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                                </div>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </li>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php endwhile; ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         </ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members' ); ?>
-                       <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo esc_attr( $instance['max_members'] ); ?>" />
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members', false ); ?>
+
+                       <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo esc_attr( $settings['max_members'] ); ?>" />
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <?php else: ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="widget-error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php _e('No one has signed up yet!', 'buddypress') ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php esc_html_e( 'No one has signed up yet!', 'buddypress' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <?php 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">-                <?php echo $after_widget; ?>
-       <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php echo $args['after_widget'];
</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">@@ -150,13 +158,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $old_instance The old instance options.
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array $instance The parsed options to be saved.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function update( $new_instance, $old_instance ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update( $new_instance, $old_instance ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance = $old_instance;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $instance['title']          = strip_tags( $new_instance['title'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $instance['title']          = strip_tags( $new_instance['title'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $instance['max_members']    = strip_tags( $new_instance['max_members'] );
</span><span class="cx" style="display: block; padding: 0 10px">                $instance['member_default'] = strip_tags( $new_instance['member_default'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $instance['link_title']     = (bool)$new_instance['link_title'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $instance['link_title']     = (bool) $new_instance['link_title'];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $instance;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,39 +174,65 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @param $instance Settings for this 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">-        function form( $instance ) {
-               $defaults = array(
-                       'title'          => __( 'Members', 'buddypress' ),
-                       'max_members'    => 5,
-                       'member_default' => 'active',
-                       'link_title'     => false
-               );
-               $instance = wp_parse_args( (array) $instance, $defaults );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function form( $instance ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $title          = strip_tags( $instance['title'] );
-               $max_members    = strip_tags( $instance['max_members'] );
-               $member_default = strip_tags( $instance['member_default'] );
-               $link_title     = (bool)$instance['link_title'];
-               ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Get widget settings
+               $settings       = $this->parse_settings( $instance );
+               $title          = strip_tags( $settings['title'] );
+               $max_members    = strip_tags( $settings['max_members'] );
+               $member_default = strip_tags( $settings['member_default'] );
+               $link_title     = (bool) $settings['link_title']; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <p>
+                       <label for="bp-core-widget-title">
+                               <?php esc_html_e( 'Title:', 'buddypress' ); ?>
+                               <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" />
+                       </label>
+               </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p><label for="<?php echo $this->get_field_name('link_title') ?>"><input type="checkbox" name="<?php echo $this->get_field_name('link_title') ?>" value="1" <?php checked( $link_title ) ?> /> <?php _e( 'Link widget title to Members directory', 'buddypress' ) ?></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <p>
+                       <label for="<?php echo $this->get_field_name( 'link_title' ) ?>">
+                               <input type="checkbox" name="<?php echo $this->get_field_name( 'link_title' ) ?>" value="1" <?php checked( $link_title ) ?> />
+                               <?php esc_html_e( 'Link widget title to Members directory', 'buddypress' ); ?>
+                       </label>
+               </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <p><label for="bp-core-widget-members-max"><?php _e('Max members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <p>
+                       <label for="bp-core-widget-members-max">
+                               <?php esc_html_e( 'Max members to show:', 'buddypress' ); ?>
+                               <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" />
+                       </label>
+               </p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <label for="bp-core-widget-groups-default"><?php _e('Default members to show:', 'buddypress'); ?>
-                       <select name="<?php echo $this->get_field_name( 'member_default' ) ?>">
-                               <option value="newest" <?php if ( $member_default == 'newest' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Newest', 'buddypress' ) ?></option>
-                               <option value="active" <?php if ( $member_default == 'active' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Active', 'buddypress' ) ?></option>
-                               <option value="popular"  <?php if ( $member_default == 'popular' ) : ?>selected="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></option>
-                       </select>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <label for="bp-core-widget-groups-default"><?php esc_html_e( 'Default members to show:', 'buddypress' ); ?>
+                               <select name="<?php echo $this->get_field_name( 'member_default' ) ?>">
+                                       <option value="newest"  <?php if ( 'newest'  === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Newest',  'buddypress' ); ?></option>
+                                       <option value="active"  <?php if ( 'active'  === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Active',  'buddypress' ); ?></option>
+                                       <option value="popular" <?php if ( 'popular' === $member_default ) : ?>selected="selected"<?php endif; ?>><?php esc_html_e( 'Popular', 'buddypress' ); ?></option>
+                               </select>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </label>
</span><span class="cx" style="display: block; padding: 0 10px">                </p>
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       /**
+        * Merge the widget settings into defaults array.
+        *
+        * @since BuddyPress (2.3.0)
+        *
+        * @param $instance Instance
+        * @uses bp_parse_args() To merge widget settings into defaults
+        */
+       public function parse_settings( $instance = array() ) {
+               return bp_parse_args( $instance, array(
+                       'title'              => __( 'Members', 'buddypress' ),
+                       'max_members'    => 5,
+                       'member_default' => 'active',
+                       'link_title'     => false
+               ), 'members_widget_settings' );
+       }
</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></pre>
</div>
</div>

</body>
</html>