<!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][8443] trunk/src/bp-members/bp-members-admin.php: Add missing `$notice` to suppress debug notices.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8443">8443</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-05-22 18:31:21 +0000 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing `$notice` to suppress debug notices. Remove trailing whitespace and a few more code-clean-up bits. Props imath. See <a href="http://buddypress.trac.wordpress.org/ticket/5623">#5623</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersadminphp">trunk/src/bp-members/bp-members-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-admin.php (8442 => 8443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-admin.php 2014-05-22 17:51:33 UTC (rev 8442)
+++ trunk/src/bp-members/bp-members-admin.php 2014-05-22 18:31:21 UTC (rev 8443)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> $this->user_profile = is_network_admin() ? 'users' : 'profile';
</span><span class="cx">
</span><span class="cx"> // The current user id
</span><del>- $this->current_user_id = get_current_user_id();
</del><ins>+ $this->current_user_id = get_current_user_id();
</ins><span class="cx">
</span><span class="cx"> // The user id being edited
</span><span class="cx"> $this->user_id = 0;
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> * Get the user ID
</span><span class="cx"> *
</span><span class="cx"> * Look for $_GET['user_id']. If anything else, force the user ID to the
</span><del>- * current user's ID so they aren't left without a user to edit.
</del><ins>+ * current user's ID so they aren't left without a user to edit.
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><span class="cx"> *
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Can the current user edit the one displayed
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * self profile editing / or bp_moderate check.
</span><span class="cx"> * This might be replaced by more granular capabilities
</span><span class="cx"> * in the future.
</span><span class="lines">@@ -266,6 +266,10 @@
</span><span class="cx"> */
</span><span class="cx"> private function get_user_notice() {
</span><span class="cx">
</span><ins>+ // Setup empty notice for return value
+ $notice = array();
+
+ // Updates
</ins><span class="cx"> if ( ! empty( $_REQUEST['updated'] ) ) {
</span><span class="cx"> switch ( $_REQUEST['updated'] ) {
</span><span class="cx"> case 'avatar':
</span><span class="lines">@@ -295,6 +299,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Errors
</ins><span class="cx"> if ( ! empty( $_REQUEST['error'] ) ) {
</span><span class="cx"> switch ( $_REQUEST['error'] ) {
</span><span class="cx"> case 'avatar':
</span><span class="lines">@@ -450,7 +455,7 @@
</span><span class="cx"> // Add the profile_admin_head method to proper admin_head actions
</span><span class="cx"> foreach ( $page_head as $head ) {
</span><span class="cx"> add_action( "admin_head-{$head}", array( $this, 'profile_admin_head' ) );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -762,8 +767,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Construct URL for form
</span><del>- $form_url = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham' ), $_SERVER['REQUEST_URI'] );
- $form_url = add_query_arg( 'action', 'update', $form_url );
</del><ins>+ $request_url = remove_query_arg( array( 'action', 'error', 'updated', 'spam', 'ham' ), $_SERVER['REQUEST_URI'] );
+ $form_action_url = add_query_arg( 'action', 'update', $request_url );
</ins><span class="cx"> $wp_http_referer = false;
</span><span class="cx"> if ( ! empty( $_REQUEST['wp_http_referer'] ) ) {
</span><span class="cx"> $wp_http_referer = remove_query_arg( array( 'action', 'updated' ), $_REQUEST['wp_http_referer'] );
</span><span class="lines">@@ -811,7 +816,7 @@
</span><span class="cx">
</span><span class="cx"> $this->profile_nav( $user, 'BuddyPress' ); ?>
</span><span class="cx">
</span><del>- <form action="<?php echo esc_url( $form_url ); ?>" id="your-profile" method="post">
</del><ins>+ <form action="<?php echo esc_url( $form_action_url ); ?>" id="your-profile" method="post">
</ins><span class="cx"> <div id="poststuff">
</span><span class="cx">
</span><span class="cx"> <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
</span><span class="lines">@@ -1043,7 +1048,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Add a filter to edit profile url in WP Admin Bar
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><span class="cx"> */
</span><span class="lines">@@ -1053,10 +1058,10 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the profile url
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses user_admin_url()
</span><span class="cx"> */
</span><span class="cx"> public function filter_adminbar_profile_link( $profile_link = '', $url = '', $user_id = 0 ) {
</span><span class="lines">@@ -1068,7 +1073,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Remove the filter to edit profile url in WP Admin Bar
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @access public
</span><span class="cx"> * @since BuddyPress (2.1.0)
</span><span class="cx"> */
</span><span class="lines">@@ -1386,7 +1391,7 @@
</span><span class="cx"> // Setup empty notice for return value
</span><span class="cx"> $notice = array();
</span><span class="cx">
</span><del>- // Updated
</del><ins>+ // Updates
</ins><span class="cx"> if ( ! empty( $_REQUEST['updated'] ) ) {
</span><span class="cx"> switch ( $_REQUEST['updated'] ) {
</span><span class="cx"> case 'resent':
</span><span class="lines">@@ -1493,7 +1498,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Process error messages
</del><ins>+ // Errors
</ins><span class="cx"> if ( ! empty( $_REQUEST['error'] ) ) {
</span><span class="cx"> switch ( $_REQUEST['error'] ) {
</span><span class="cx"> case 'do_resend':
</span></span></pre>
</div>
</div>
</body>
</html>