<!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][10456] trunk/src/bp-members: Make sure the Sign-ups Administration page is available when BuddyPress is "multiblog" activated.</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/10456">10456</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/10456","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-01-19 19:22:54 +0000 (Tue, 19 Jan 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'>Make sure the Sign-ups Administration page is available when BuddyPress is "multiblog" activated.
On multisite configs, when the constant `BP_ENABLE_MULTIBLOG` is set to true, Sign-ups can be managed from the Users administration of the network.
Props r-a-y, sbrajesh
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6371">#6371</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersadminbpmembersadminclassesphp">trunk/src/bp-members/admin/bp-members-admin-classes.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersadminphp">trunk/src/bp-members/bp-members-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersadminbpmembersadminclassesphp"></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/admin/bp-members-admin-classes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/admin/bp-members-admin-classes.php 2016-01-18 07:34:34 UTC (rev 10455)
+++ trunk/src/bp-members/admin/bp-members-admin-classes.php 2016-01-19 19:22:54 UTC (rev 10456)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the 'current' class from the 'All' link.
</span><span class="cx" style="display: block; padding: 0 10px"> $views['all'] = str_replace( 'class="current"', '', $views['all'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $views['registered'] = sprintf( '<a href="%1$s" class="current">%2$s</a>', esc_url( add_query_arg( 'page', 'bp-signups', network_admin_url( 'users.php' ) ) ), sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $this->signup_counts ) . ')</span>' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $views;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'signup_id' => $signup_object->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'resend',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ network_admin_url( 'users.php' )
</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"> // Activate link.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,7 +656,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'signup_id' => $signup_object->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'activate',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ network_admin_url( 'users.php' )
</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"> // Delete link.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,7 +666,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'signup_id' => $signup_object->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'delete',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ network_admin_url( 'users.php' )
</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"> echo $avatar . sprintf( '<strong><a href="%1$s" class="edit" title="%2$s">%3$s</a></strong><br/>', esc_url( $activate_link ), esc_attr__( 'Activate', 'buddypress' ), $signup_object->user_login );
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersadminphp"></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-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-admin.php 2016-01-18 07:34:34 UTC (rev 10455)
+++ trunk/src/bp-members/bp-members-admin.php 2016-01-19 19:22:54 UTC (rev 10456)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,8 +202,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reorganise the views navigation in users.php and signups page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( $this->capability ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( "views_{$this->users_screen}", array( $this, 'signup_filter_view' ), 10, 1 );
- add_filter( 'set-screen-option', array( $this, 'signup_screen_options' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_screen = $this->users_screen;
+
+ /**
+ * Users screen on multiblog is users, but signups
+ * need to be managed in the network for this case
+ */
+ if ( bp_is_network_activated() && bp_is_multiblog_mode() && false === strpos( $user_screen, '-network' ) ) {
+ $user_screen .= '-network';
+ }
+
+ add_filter( "views_{$user_screen}", array( $this, 'signup_filter_view' ), 10, 1 );
+ add_filter( 'set-screen-option', array( $this, 'signup_screen_options' ), 10, 3 );
</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">@@ -1324,7 +1334,14 @@
</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"> $signups = BP_Signup::count_signups();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = add_query_arg( 'page', 'bp-signups', bp_get_admin_url( 'users.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_network_admin() ) {
+ $base_url = network_admin_url( 'users.php' );
+ } else {
+ $base_url = bp_get_admin_url( 'users.php' );
+ }
+
+ $url = add_query_arg( 'page', 'bp-signups', $base_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( _x( 'Pending %s', 'signup users', 'buddypress' ), '<span class="count">(' . number_format_i18n( $signups ) . ')</span>' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $views['registered'] = sprintf( '<a href="%1$s" class="%2$s">%3$s</a>', esc_url( $url ), $class, $text );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1394,7 +1411,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare the display of the Community Profile screen.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $doaction, $allowed_actions ) || ( -1 == $doaction ) ) {
</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 ( bp_core_do_network_admin() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_network_admin() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_MS_List_Table', 'ms-users' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp_members_signup_list_table = self::get_list_table_class( 'BP_Members_List_Table', 'users' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1783,11 +1800,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare the group items for display.
</span><span class="cx" style="display: block; padding: 0 10px"> $bp_members_signup_list_table->prepare_items();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_network_admin() ) {
+ $form_url = network_admin_url( 'users.php' );
+ } else {
+ $form_url = bp_get_admin_url( 'users.php' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $form_url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'page' => 'bp-signups',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $form_url
</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"> $search_form_url = remove_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1923,11 +1946,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'signup_ids' => implode( ',', $signup_ids )
</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">- $cancel_url = add_query_arg( $url_args, bp_get_admin_url( 'users.php' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_network_admin() ) {
+ $base_url = network_admin_url( 'users.php' );
+ } else {
+ $base_url = bp_get_admin_url( 'users.php' );
+ }
+
+ $cancel_url = add_query_arg( $url_args, $base_url );
</ins><span class="cx" style="display: block; padding: 0 10px"> $action_url = wp_nonce_url(
</span><span class="cx" style="display: block; padding: 0 10px"> add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array_merge( $url_args, $action_args ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_admin_url( 'users.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $base_url
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'signups_' . $action
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>