<!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][6740] trunk: Cast more POST values and code prettifying in bp-default and bp-legacy.</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, #logmsg > ol { margin-left: 0; 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/6740">6740</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-01-22 19:34:16 +0000 (Tue, 22 Jan 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cast more POST values and code prettifying in bp-default and bp-legacy. Props Maty.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (6739 => 6740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-01-22 19:19:12 UTC (rev 6739)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-01-22 19:34:16 UTC (rev 6740)
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'friends_accept_friendship' );
</span><span class="cx">
</span><del>- if ( ! friends_accept_friendship( $_POST['id'] ) )
</del><ins>+ if ( ! friends_accept_friendship( (int) $_POST['id'] ) )
</ins><span class="cx"> echo "-1<div id='message' class='error'><p>" . __( 'There was a problem accepting that request. Please try again.', 'buddypress' ) . '</p></div>';
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -915,7 +915,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'friends_reject_friendship' );
</span><span class="cx">
</span><del>- if ( ! friends_reject_friendship( $_POST['id'] ) )
</del><ins>+ if ( ! friends_reject_friendship( (int) $_POST['id'] ) )
</ins><span class="cx"> echo "-1<div id='message' class='error'><p>" . __( 'There was a problem rejecting that request. Please try again.', 'buddypress' ) . '</p></div>';
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -932,39 +932,45 @@
</span><span class="cx"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( groups_is_user_banned( bp_loggedin_user_id(), $_POST['gid'] ) )
</del><ins>+ // Cast gid as integer
+ $group_id = (int) $_POST['gid'];
+
+ if ( groups_is_user_banned( bp_loggedin_user_id(), $group_id ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( ! $group = groups_get_group( array( 'group_id' => $_POST['gid'] ) ) )
</del><ins>+ if ( ! $group = groups_get_group( array( 'group_id' => $group_id ) ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( ! groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
</span><span class="cx"> if ( 'public' == $group->status ) {
</span><span class="cx"> check_ajax_referer( 'groups_join_group' );
</span><span class="cx">
</span><del>- if ( ! groups_join_group( $group->id ) )
</del><ins>+ if ( ! groups_join_group( $group->id ) ) {
</ins><span class="cx"> _e( 'Error joining group', 'buddypress' );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> } elseif ( 'private' == $group->status ) {
</span><span class="cx"> check_ajax_referer( 'groups_request_membership' );
</span><span class="cx">
</span><del>- if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) )
</del><ins>+ if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) ) {
</ins><span class="cx"> _e( 'Error requesting membership', 'buddypress' );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> check_ajax_referer( 'groups_leave_group' );
</span><span class="cx">
</span><del>- if ( ! groups_leave_group( $group->id ) )
</del><ins>+ if ( ! groups_leave_group( $group->id ) ) {
</ins><span class="cx"> _e( 'Error leaving group', 'buddypress' );
</span><del>- elseif ( 'public' == $group->status )
</del><ins>+ } elseif ( 'public' == $group->status ) {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</span><del>- elseif ( 'private' == $group->status )
</del><ins>+ } elseif ( 'private' == $group->status ) {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -1008,14 +1014,14 @@
</span><span class="cx">
</span><span class="cx"> check_ajax_referer( 'messages_send_message' );
</span><span class="cx">
</span><del>- $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
</del><ins>+ $result = messages_new_message( array( 'thread_id' => (int) $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $result ) ) {
</span><span class="cx">
</span><span class="cx"> // Get the zebra line classes correct on ajax requests
</span><span class="cx"> global $thread_template;
</span><span class="cx">
</span><del>- bp_thread_has_messages( array( 'thread_id' => $_REQUEST['thread_id'] ) );
</del><ins>+ bp_thread_has_messages( array( 'thread_id' => (int) $_REQUEST['thread_id'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( $thread_template->message_count % 2 == 1 ) {
</span><span class="cx"> $class = 'odd';
</span><span class="lines">@@ -1069,7 +1075,7 @@
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><span class="cx"> for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
</span><del>- BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
</del><ins>+ BP_Messages_Thread::mark_as_unread( (int) $thread_ids[$i] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1094,7 +1100,7 @@
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><span class="cx"> for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
</span><del>- BP_Messages_Thread::mark_as_read($thread_ids[$i]);
</del><ins>+ BP_Messages_Thread::mark_as_read( (int) $thread_ids[$i] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1118,8 +1124,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><del>- for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i )
- BP_Messages_Thread::delete($thread_ids[$i]);
</del><ins>+ for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
+ BP_Messages_Thread::delete( (int) $thread_ids[$i] );
+ }
</ins><span class="cx">
</span><span class="cx"> _e( 'Messages deleted.', 'buddypress' );
</span><span class="cx"> }
</span><span class="lines">@@ -1135,14 +1142,13 @@
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> */
</span><span class="cx"> function bp_legacy_theme_ajax_messages_autocomplete_results() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> // Include everyone in the autocomplete, or just friends?
</span><span class="cx"> if ( bp_is_current_component( bp_get_messages_slug() ) )
</span><del>- $autocomplete_all = $bp->messages->autocomplete_all;
</del><ins>+ $autocomplete_all = buddypress()->messages->autocomplete_all;
</ins><span class="cx">
</span><span class="cx"> $pag_page = 1;
</span><del>- $limit = $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
</del><ins>+ $limit = (int) $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
</ins><span class="cx">
</span><span class="cx"> // Get the user ids based on the search terms
</span><span class="cx"> if ( ! empty( $autocomplete_all ) ) {
</span><span class="lines">@@ -1152,8 +1158,9 @@
</span><span class="cx"> // Build an array with the correct format
</span><span class="cx"> $user_ids = array();
</span><span class="cx"> foreach( $users['users'] as $user ) {
</span><del>- if ( $user->id != bp_loggedin_user_id() )
</del><ins>+ if ( $user->id != bp_loggedin_user_id() ) {
</ins><span class="cx"> $user_ids[] = $user->id;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user_ids = apply_filters( 'bp_core_autocomplete_ids', $user_ids, $_GET['q'], $limit );
</span><span class="lines">@@ -1166,25 +1173,28 @@
</span><span class="cx"> // Keeping the bp_friends_autocomplete_list filter for backward compatibility
</span><span class="cx"> $users = apply_filters( 'bp_friends_autocomplete_list', $users, $_GET['q'], $limit );
</span><span class="cx">
</span><del>- if ( ! empty( $users['friends'] ) )
</del><ins>+ if ( ! empty( $users['friends'] ) ) {
</ins><span class="cx"> $user_ids = apply_filters( 'bp_friends_autocomplete_ids', $users['friends'], $_GET['q'], $limit );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $user_ids ) ) {
</span><span class="cx"> foreach ( $user_ids as $user_id ) {
</span><span class="cx"> $ud = get_userdata( $user_id );
</span><del>- if ( ! $ud )
</del><ins>+ if ( ! $ud ) {
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( bp_is_username_compatibility_mode() )
</del><ins>+ if ( bp_is_username_compatibility_mode() ) {
</ins><span class="cx"> $username = $ud->user_login;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $username = $ud->user_nicename;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Note that the final line break acts as a delimiter for the
</span><span class="cx"> // autocomplete javascript and thus should not be removed
</span><del>- echo '<span id="link-' . $username . '" href="' . bp_core_get_user_domain( $user_id ) . '"></span>' . bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15, 'alt' => $ud->display_name ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')' . "\n";
</del><ins>+ echo '<span id="link-' . esc_attr( $username ) . '" href="' . bp_core_get_user_domain( $user_id ) . '"></span>' . bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15, 'alt' => $ud->display_name ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . esc_html( $username ) . ')' . "\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (6739 => 6740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2013-01-22 19:19:12 UTC (rev 6739)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2013-01-22 19:34:16 UTC (rev 6740)
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'friends_accept_friendship' );
</span><span class="cx">
</span><del>- if ( ! friends_accept_friendship( $_POST['id'] ) )
</del><ins>+ if ( ! friends_accept_friendship( (int) $_POST['id'] ) )
</ins><span class="cx"> echo "-1<div id='message' class='error'><p>" . __( 'There was a problem accepting that request. Please try again.', 'buddypress' ) . '</p></div>';
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer( 'friends_reject_friendship' );
</span><span class="cx">
</span><del>- if ( ! friends_reject_friendship( $_POST['id'] ) )
</del><ins>+ if ( ! friends_reject_friendship( (int) $_POST['id'] ) )
</ins><span class="cx"> echo "-1<div id='message' class='error'><p>" . __( 'There was a problem rejecting that request. Please try again.', 'buddypress' ) . '</p></div>';
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -684,39 +684,45 @@
</span><span class="cx"> if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( groups_is_user_banned( bp_loggedin_user_id(), $_POST['gid'] ) )
</del><ins>+ // Cast gid as integer
+ $group_id = (int) $_POST['gid'];
+
+ if ( groups_is_user_banned( bp_loggedin_user_id(), $group_id ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( ! $group = groups_get_group( array( 'group_id' => $_POST['gid'] ) ) )
</del><ins>+ if ( ! $group = groups_get_group( array( 'group_id' => $group_id ) ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( ! groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
</span><span class="cx"> if ( 'public' == $group->status ) {
</span><span class="cx"> check_ajax_referer( 'groups_join_group' );
</span><span class="cx">
</span><del>- if ( ! groups_join_group( $group->id ) )
</del><ins>+ if ( ! groups_join_group( $group->id ) ) {
</ins><span class="cx"> _e( 'Error joining group', 'buddypress' );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'leave-group', 'groups_leave_group' ) . '">' . __( 'Leave Group', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> } elseif ( 'private' == $group->status ) {
</span><span class="cx"> check_ajax_referer( 'groups_request_membership' );
</span><span class="cx">
</span><del>- if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) )
</del><ins>+ if ( ! groups_send_membership_request( bp_loggedin_user_id(), $group->id ) ) {
</ins><span class="cx"> _e( 'Error requesting membership', 'buddypress' );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="membership-requested" rel="membership-requested" title="' . __( 'Membership Requested', 'buddypress' ) . '" href="' . bp_get_group_permalink( $group ) . '">' . __( 'Membership Requested', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> check_ajax_referer( 'groups_leave_group' );
</span><span class="cx">
</span><del>- if ( ! groups_leave_group( $group->id ) )
</del><ins>+ if ( ! groups_leave_group( $group->id ) ) {
</ins><span class="cx"> _e( 'Error leaving group', 'buddypress' );
</span><del>- elseif ( 'public' == $group->status )
</del><ins>+ } elseif ( 'public' == $group->status ) {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'join', 'groups_join_group' ) . '">' . __( 'Join Group', 'buddypress' ) . '</a>';
</span><del>- elseif ( 'private' == $group->status )
</del><ins>+ } elseif ( 'private' == $group->status ) {
</ins><span class="cx"> echo '<a id="group-' . esc_attr( $group->id ) . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . wp_nonce_url( bp_get_group_permalink( $group ) . 'request-membership', 'groups_send_membership_request' ) . '">' . __( 'Request Membership', 'buddypress' ) . '</a>';
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="lines">@@ -760,7 +766,7 @@
</span><span class="cx">
</span><span class="cx"> check_ajax_referer( 'messages_send_message' );
</span><span class="cx">
</span><del>- $result = messages_new_message( array( 'thread_id' => $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
</del><ins>+ $result = messages_new_message( array( 'thread_id' => (int) $_REQUEST['thread_id'], 'content' => $_REQUEST['content'] ) );
</ins><span class="cx">
</span><span class="cx"> if ( $result ) { ?>
</span><span class="cx"> <div class="message-box new-message">
</span><span class="lines">@@ -809,7 +815,7 @@
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><span class="cx"> for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
</span><del>- BP_Messages_Thread::mark_as_unread($thread_ids[$i]);
</del><ins>+ BP_Messages_Thread::mark_as_unread( (int) $thread_ids[$i] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -834,7 +840,7 @@
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><span class="cx"> for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
</span><del>- BP_Messages_Thread::mark_as_read($thread_ids[$i]);
</del><ins>+ BP_Messages_Thread::mark_as_read( (int) $thread_ids[$i] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -858,8 +864,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> $thread_ids = explode( ',', $_POST['thread_ids'] );
</span><span class="cx">
</span><del>- for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i )
- BP_Messages_Thread::delete($thread_ids[$i]);
</del><ins>+ for ( $i = 0, $count = count( $thread_ids ); $i < $count; ++$i ) {
+ BP_Messages_Thread::delete( (int) $thread_ids[$i] );
+ }
</ins><span class="cx">
</span><span class="cx"> _e( 'Messages deleted.', 'buddypress' );
</span><span class="cx"> }
</span><span class="lines">@@ -870,19 +877,17 @@
</span><span class="cx"> /**
</span><span class="cx"> * AJAX handler for autocomplete. Displays friends only, unless BP_MESSAGES_AUTOCOMPLETE_ALL is defined.
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp The one true BuddyPress instance
</del><span class="cx"> * @return string HTML
</span><span class="cx"> * @since BuddyPress (1.2)
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_ajax_messages_autocomplete_results() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> // Include everyone in the autocomplete, or just friends?
</span><span class="cx"> if ( bp_is_current_component( bp_get_messages_slug() ) )
</span><del>- $autocomplete_all = $bp->messages->autocomplete_all;
</del><ins>+ $autocomplete_all = buddypress()->messages->autocomplete_all;
</ins><span class="cx">
</span><span class="cx"> $pag_page = 1;
</span><del>- $limit = $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
</del><ins>+ $limit = (int) $_GET['limit'] ? $_GET['limit'] : apply_filters( 'bp_autocomplete_max_results', 10 );
</ins><span class="cx">
</span><span class="cx"> // Get the user ids based on the search terms
</span><span class="cx"> if ( ! empty( $autocomplete_all ) ) {
</span><span class="lines">@@ -892,8 +897,9 @@
</span><span class="cx"> // Build an array with the correct format
</span><span class="cx"> $user_ids = array();
</span><span class="cx"> foreach( $users['users'] as $user ) {
</span><del>- if ( $user->id != bp_loggedin_user_id() )
</del><ins>+ if ( $user->id != bp_loggedin_user_id() ) {
</ins><span class="cx"> $user_ids[] = $user->id;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $user_ids = apply_filters( 'bp_core_autocomplete_ids', $user_ids, $_GET['q'], $limit );
</span><span class="lines">@@ -906,28 +912,30 @@
</span><span class="cx"> // Keeping the bp_friends_autocomplete_list filter for backward compatibility
</span><span class="cx"> $users = apply_filters( 'bp_friends_autocomplete_list', $users, $_GET['q'], $limit );
</span><span class="cx">
</span><del>- if ( ! empty( $users['friends'] ) )
</del><ins>+ if ( ! empty( $users['friends'] ) ) {
</ins><span class="cx"> $user_ids = apply_filters( 'bp_friends_autocomplete_ids', $users['friends'], $_GET['q'], $limit );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $user_ids ) ) {
</span><span class="cx"> foreach ( $user_ids as $user_id ) {
</span><span class="cx"> $ud = get_userdata( $user_id );
</span><del>- if ( ! $ud )
</del><ins>+ if ( ! $ud ) {
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( bp_is_username_compatibility_mode() )
</del><ins>+ if ( bp_is_username_compatibility_mode() ) {
</ins><span class="cx"> $username = $ud->user_login;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $username = $ud->user_nicename;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Note that the final line break acts as a delimiter for the
</span><span class="cx"> // autocomplete javascript and thus should not be removed
</span><del>- echo '<span id="link-' . $username . '" href="' . bp_core_get_user_domain( $user_id ) . '"></span>' . bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15, 'alt' => $ud->display_name ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . $username . ')' . "\n";
</del><ins>+ echo '<span id="link-' . esc_attr( $username ) . '" href="' . bp_core_get_user_domain( $user_id ) . '"></span>' . bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'width' => 15, 'height' => 15, 'alt' => $ud->display_name ) ) . ' &nbsp;' . bp_core_get_user_displayname( $user_id ) . ' (' . esc_html( $username ) . ')' . "\n";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><del>-?>
</del></span></pre>
</div>
</div>
</body>
</html>