<!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][11032] trunk/src: Fix indentation across all components.</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/11032">11032</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/11032","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-24 11:25:28 +0000 (Wed, 24 Aug 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'>Fix indentation across all components.
Props Scrutinizer-CI
See <a href="http://buddypress.trac.wordpress.org/ticket/5891">#5891</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreactionsphp">trunk/src/bp-core/bp-core-actions.php</a></li>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunksrcbpcorebpcorebuddybarphp">trunk/src/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunksrcbpcorebpcorefiltersphp">trunk/src/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpthemecompatphp">trunk/src/bp-core/classes/class-bp-theme-compat.php</a></li>
<li><a href="#trunksrcbpforumsbpforumsbbpresssaphp">trunk/src/bp-forums/bp-forums-bbpress-sa.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfunctionsphp">trunk/src/bp-groups/bp-groups-functions.php</a></li>
<li><a href="#trunksrcbpgroupsclassesclassbpgroupsmemberphp">trunk/src/bp-groups/classes/class-bp-groups-member.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersscreensphp">trunk/src/bp-members/bp-members-screens.php</a></li>
<li><a href="#trunksrcbpsettingsbpsettingsactionsphp">trunk/src/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-actions.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-core/bp-core-actions.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * near the bottom of this file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * v--WordPress Actions v--BuddyPress Sub-actions
</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"> add_action( 'plugins_loaded', 'bp_loaded', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', 'bp_init', 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'rest_api_init', 'bp_rest_api_init', 20 ); // After WP core.
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-admin.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-core/bp-core-admin.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,25 +30,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _n_noop( 'Security Release', 'Security Releases', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> _n_noop( 'Maintenance and Security Release', 'Maintenance and Security Releases', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress version number. */
- _n_noop( '<strong>Version %1$s</strong> addressed a security issue.',
- '<strong>Version %1$s</strong> addressed some security issues.',
- 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: BuddyPress version number. */
+ _n_noop(
+ '<strong>Version %1$s</strong> addressed a security issue.',
+ '<strong>Version %1$s</strong> addressed some security issues.',
+ 'buddypress'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress version number, 2: plural number of bugs. */
- _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
- '<strong>Version %1$s</strong> addressed %2$s bugs.',
- 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: BuddyPress version number, 2: plural number of bugs. */
+ _n_noop(
+ '<strong>Version %1$s</strong> addressed %2$s bug.',
+ '<strong>Version %1$s</strong> addressed %2$s bugs.',
+ 'buddypress'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
- _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
- '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.',
- 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: BuddyPress version number, 2: plural number of bugs. Singular security issue. */
+ _n_noop(
+ '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+ '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.',
+ 'buddypress'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
- _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
- '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
- 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: BuddyPress version number, 2: plural number of bugs. More than one security issue. */
+ _n_noop(
+ '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+ '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',
+ 'buddypress'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'For more information, see <a href="%s">the release notes</a>.', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-buddybar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-buddybar.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-core/bp-core-buddybar.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,9 +214,9 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * If this is for site admins only and the user is not one,
- * don't register this screen function.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * If this is for site admins only and the user is not one,
+ * don't register this screen function.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r['site_admin_only'] ) && ! bp_current_user_can( 'bp_moderate' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-filters.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-core/bp-core-filters.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,7 +178,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) buddypress()->pages as $component => $bp_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Handles the majority of components.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_current_component( $component ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $page_id = (int) $bp_page->id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $page_id = (int) $bp_page->id;
</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"> // Stop if not on a user page.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1051,13 +1051,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_obj ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tokens['recipient.username'] = $user_obj->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( bp_is_active( 'settings' ) && empty( $tokens['unsubscribe'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tokens['unsubscribe'] = esc_url( sprintf(
- '%s%s/notifications/',
- bp_core_get_user_domain( $user_obj->ID ),
- bp_get_settings_slug()
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tokens['unsubscribe'] = esc_url( sprintf(
+ '%s%s/notifications/',
+ bp_core_get_user_domain( $user_obj->ID ),
+ bp_get_settings_slug()
+ ) );
</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">+ }
</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"> // Set default unsubscribe link if not passed.
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpthemecompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-theme-compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-theme-compat.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-core/classes/class-bp-theme-compat.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $properties Array of properties for BP_Theme_Compat.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct( Array $properties = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( Array $properties = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_data = $properties;
</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="trunksrcbpforumsbpforumsbbpresssaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-forums/bp-forums-bbpress-sa.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-forums/bp-forums-bbpress-sa.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-forums/bp-forums-bbpress-sa.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,13 +283,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function init( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 4 == func_num_args() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'user' => $args,
- 'password' => func_get_arg( 1 ),
- 'name' => func_get_arg( 2 ),
- 'host' => func_get_arg( 3 ),
- 'charset' => defined( 'BBDB_CHARSET' ) ? BBDB_CHARSET : false,
- 'collate' => defined( 'BBDB_COLLATE' ) ? BBDB_COLLATE : false,
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'user' => $args,
+ 'password' => func_get_arg( 1 ),
+ 'name' => func_get_arg( 2 ),
+ 'host' => func_get_arg( 3 ),
+ 'charset' => defined( 'BBDB_CHARSET' ) ? BBDB_CHARSET : false,
+ 'collate' => defined( 'BBDB_COLLATE' ) ? BBDB_COLLATE : false,
+ );
</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"> $defaults = array(
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfunctionsphp"></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/bp-groups-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-functions.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-groups/bp-groups-functions.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1736,7 +1736,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_is_item_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 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><span class="cx" style="display: block; padding: 0 10px"> $member = new BP_Groups_Member( $user_id, $group_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpgroupsclassesclassbpgroupsmemberphp"></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-member.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-member.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-groups/classes/class-bp-groups-member.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,7 +678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $limit && $page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit ), intval( $limit ) );
</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><span class="cx" style="display: block; padding: 0 10px"> if ( $filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $search_terms_like = '%' . bp_esc_like( $filter ) . '%';
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersscreensphp"></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-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-screens.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-members/bp-members-screens.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the signup page is submitted, validate and save.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['signup_submit'] ) && bp_verify_nonce_request( 'bp_new_signup' ) ) {
</span><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">+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Fires before the validation of a new signup.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</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">
</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"> * Fires after the validation of a new signup.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.1.0
</span></span></pre></div>
<a id="trunksrcbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/bp-settings-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/bp-settings-actions.php 2016-08-24 09:30:04 UTC (rev 11031)
+++ trunk/src/bp-settings/bp-settings-actions.php 2016-08-24 11:25:28 UTC (rev 11032)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Email change is being dismissed.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_GET['dismiss_email_change'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_delete_user_meta( bp_displayed_user_id(), 'pending_email_change' );
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'You have successfully dismissed your pending email change.', 'buddypress' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_redirect( $redirect_to );
</span></span></pre>
</div>
</div>
</body>
</html>