<!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][10553] trunk/src: Restore template globals after widget loops.</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/10553">10553</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/10553","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-08 04:14:59 +0000 (Mon, 08 Feb 2016)</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'>Restore template globals after widget loops.
BP template loop functions, like `bp_has_members()`, are responsible for
populating corresponding template globals. When this happens inside of a
"secondary" loop - such as a sidebar widget - the loop should clean up after
itself by resetting the relevant template global to whatever it previously was
before the secondary loop had run. (This is a rough approximation of WP's
`wp_reset_postdata()` for BP loops.)
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5170">#5170</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsclassesclassbpblogsrecentpostswidgetphp">trunk/src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php</a></li>
<li><a href="#trunksrcbpfriendsclassesclassbpcorefriendswidgetphp">trunk/src/bp-friends/classes/class-bp-core-friends-widget.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupswidgetphp">trunk/src/bp-groups/classes/class-bp-groups-widget.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpcorememberswidgetphp">trunk/src/bp-members/classes/class-bp-core-members-widget.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpcorerecentlyactivewidgetphp">trunk/src/bp-members/classes/class-bp-core-recently-active-widget.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpcorewhosonlinewidgetphp">trunk/src/bp-members/classes/class-bp-core-whos-online-widget.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsclassesclassbpblogsrecentpostswidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-blogs/classes/class-bp-blogs-recent-posts-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,6 +35,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $activities_template;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = ! empty( $instance['title'] )
</span><span class="cx" style="display: block; padding: 0 10px"> ? esc_html( $instance['title'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,8 +75,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'scope' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'primary_id' => 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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up global.
+ $old_activities_template = $activities_template;
+
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_has_activities( $args ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="blog-post-list" class="activity-list item-list">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +113,10 @@
</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 $after_widget;
+
+ // Restore the global.
+ $activities_template = $old_activities_template;
</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>
<a id="trunksrcbpfriendsclassesclassbpcorefriendswidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/classes/class-bp-core-friends-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/classes/class-bp-core-friends-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-friends/classes/class-bp-core-friends-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,6 +36,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance The widget settings, as saved by the user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $members_template;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> extract( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_displayed_user_id() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,6 +80,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'populate_extras' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up the global.
+ $old_members_template = $members_template;
+
</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 if ( bp_has_members( $members_args ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +129,10 @@
</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 $after_widget;
+
+ // Restore the global.
+ $members_template = $old_members_template;
</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>
<a id="trunksrcbpgroupsclassesclassbpgroupswidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/classes/class-bp-groups-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/classes/class-bp-groups-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-groups/classes/class-bp-groups-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance Widget instance data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $groups_template;
</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 user ID to use with the widget instance.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,6 +101,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => $max_groups,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up the global.
+ $old_groups_template = $groups_template;
+
</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 if ( bp_has_groups( $group_args ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +153,10 @@
</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 $after_widget;
+
+ // Restore the global.
+ $groups_template = $old_groups_template;
</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>
<a id="trunksrcbpmembersclassesclassbpcorememberswidgetphp"></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/classes/class-bp-core-members-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-core-members-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-members/classes/class-bp-core-members-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,6 +47,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $members_template;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get widget settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = $this->parse_settings( $instance );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,8 +88,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => $settings['max_members'],
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up the global.
+ $old_members_template = $members_template;
+
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_has_members( $members_args ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="item-options" id="members-list-options">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,6 +151,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $args['after_widget'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Restore the global.
+ $members_template = $old_members_template;
</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>
<a id="trunksrcbpmembersclassesclassbpcorerecentlyactivewidgetphp"></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/classes/class-bp-core-recently-active-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-core-recently-active-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-members/classes/class-bp-core-recently-active-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $members_template;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get widget settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = $this->parse_settings( $instance );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,8 +68,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => $settings['max_members'],
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up global.
+ $old_members_template = $members_template;
+
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_has_members( $members_args ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="avatar-block">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,6 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $args['after_widget'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Restore the global.
+ $members_template = $old_members_template;
</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>
<a id="trunksrcbpmembersclassesclassbpcorewhosonlinewidgetphp"></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/classes/class-bp-core-whos-online-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-core-whos-online-widget.php 2016-02-08 03:39:10 UTC (rev 10552)
+++ trunk/src/bp-members/classes/class-bp-core-whos-online-widget.php 2016-02-08 04:14:59 UTC (rev 10553)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,6 +38,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $members_template;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get widget settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $settings = $this->parse_settings( $instance );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,8 +68,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'max' => $settings['max_members'],
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Back up global.
+ $old_members_template = $members_template;
+
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_has_members( $members_args ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="avatar-block">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,6 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $args['after_widget'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Restore the global.
+ $members_template = $old_members_template;
</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>