diff --git a/dev.php b/dev.php
index 252dfee..8aa7cf3 100644
a
|
b
|
function bp_message_thread_view_link( $thread_id = 0 ) { |
304 | 304 | * Filters the permalink of a particular thread. |
305 | 305 | * |
306 | 306 | * @since 1.0.0 |
| 307 | * @since 2.6.0 Added the `$thread_id` parameter. |
307 | 308 | * |
308 | | * @param string $value permalink of a particular thread. |
| 309 | * @param string $value Permalink of a particular thread. |
| 310 | * @param int $thread_id ID of the thread. |
309 | 311 | */ |
310 | | return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id ) ); |
| 312 | return apply_filters( 'bp_get_message_thread_view_link', trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/view/' . $thread_id ), $thread_id ); |
311 | 313 | } |
312 | 314 | |
313 | 315 | /** |
… |
… |
function bp_message_thread_total_count( $thread_id = false ) { |
546 | 548 | * Filters the current thread's total message count. |
547 | 549 | * |
548 | 550 | * @since 2.2.0 |
| 551 | * @since 2.6.0 Added the `$thread_id` parameter. |
549 | 552 | * |
550 | | * @param int $count Current thread total message count. |
| 553 | * @param int $count Current thread total message count. |
| 554 | * @param int $thread_id ID of the queried thread. |
551 | 555 | */ |
552 | | return apply_filters( 'bp_get_message_thread_total_count', $count ); |
| 556 | return apply_filters( 'bp_get_message_thread_total_count', $count, $thread_id ); |
553 | 557 | } |
554 | 558 | |
555 | 559 | /** |
… |
… |
function bp_message_thread_avatar( $args = '' ) { |
678 | 682 | * Filters the avatar for the last sender in the current message thread. |
679 | 683 | * |
680 | 684 | * @since 1.0.0 |
| 685 | * @since 2.6.0 Added the `$r` parameter. |
681 | 686 | * |
682 | 687 | * @param string $value User avatar string. |
| 688 | * @param array $r Array of parsed arguments. |
683 | 689 | */ |
684 | 690 | return apply_filters( 'bp_get_message_thread_avatar', bp_core_fetch_avatar( array( |
685 | 691 | 'item_id' => $messages_template->thread->last_sender_id, |
… |
… |
function bp_message_thread_avatar( $args = '' ) { |
689 | 695 | 'class' => $r['class'], |
690 | 696 | 'width' => $r['width'], |
691 | 697 | 'height' => $r['height'], |
692 | | ) ) ); |
| 698 | ) ), $r ); |
693 | 699 | } |
694 | 700 | |
695 | 701 | /** |
… |
… |
function bp_messages_options() { |
922 | 928 | ?> |
923 | 929 | |
924 | 930 | <label for="message-type-select" class="bp-screen-reader-text"> |
925 | | <?php _e( 'Select:', 'buddypress' ) ?> |
| 931 | <?php _e( 'Select:', 'buddypress' ); ?> |
926 | 932 | </label> |
927 | 933 | |
928 | 934 | <select name="message-type-select" id="message-type-select"> |
929 | 935 | <option value=""><?php _e( 'Select', 'buddypress' ); ?></option> |
930 | | <option value="read"><?php _ex('Read', 'Message dropdown filter', 'buddypress') ?></option> |
931 | | <option value="unread"><?php _ex('Unread', 'Message dropdown filter', 'buddypress') ?></option> |
932 | | <option value="all"><?php _ex('All', 'Message dropdown filter', 'buddypress') ?></option> |
| 936 | <option value="read"><?php _ex( 'Read', 'Message dropdown filter', 'buddypress' ); ?></option> |
| 937 | <option value="unread"><?php _ex( 'Unread', 'Message dropdown filter', 'buddypress' ); ?></option> |
| 938 | <option value="all"><?php _ex( 'All', 'Message dropdown filter', 'buddypress' ); ?></option> |
933 | 939 | </select> |
934 | 940 | |
935 | 941 | <?php if ( ! bp_is_current_action( 'sentbox' ) && ! bp_is_current_action( 'notices' ) ) : ?> |
936 | 942 | |
937 | | <a href="#" id="mark_as_read"><?php _ex('Mark as Read', 'Message management markup', 'buddypress') ?></a> |
938 | | <a href="#" id="mark_as_unread"><?php _ex('Mark as Unread', 'Message management markup', 'buddypress') ?></a> |
| 943 | <a href="#" id="mark_as_read"><?php _ex( 'Mark as Read', 'Message management markup', 'buddypress' ); ?></a> |
| 944 | <a href="#" id="mark_as_unread"><?php _ex( 'Mark as Unread', 'Message management markup', 'buddypress' ); ?></a> |
939 | 945 | |
940 | 946 | <?php endif; ?> |
941 | 947 | |
… |
… |
function bp_message_activate_deactivate_text() { |
1192 | 1198 | global $messages_template; |
1193 | 1199 | |
1194 | 1200 | if ( 1 === (int) $messages_template->thread->is_active ) { |
1195 | | $text = __('Deactivate', 'buddypress'); |
| 1201 | $text = __( 'Deactivate', 'buddypress' ); |
1196 | 1202 | } else { |
1197 | | $text = __('Activate', 'buddypress'); |
| 1203 | $text = __( 'Activate', 'buddypress' ); |
1198 | 1204 | } |
1199 | 1205 | |
1200 | 1206 | /** |
… |
… |
function bp_message_get_notices() { |
1257 | 1263 | ?> |
1258 | 1264 | <div id="message" class="info notice" rel="n-<?php echo esc_attr( $notice->id ); ?>"> |
1259 | 1265 | <p> |
1260 | | <strong><?php echo stripslashes( wp_filter_kses( $notice->subject ) ) ?></strong><br /> |
1261 | | <?php echo stripslashes( wp_filter_kses( $notice->message) ) ?> |
1262 | | <a href="#" id="close-notice"><?php _e( 'Close', 'buddypress' ) ?></a> |
| 1266 | <strong><?php echo stripslashes( wp_filter_kses( $notice->subject ) ); ?></strong><br /> |
| 1267 | <?php echo stripslashes( wp_filter_kses( $notice->message) ); ?> |
| 1268 | <a href="#" id="close-notice"><?php _e( 'Close', 'buddypress' ); ?></a> |
1263 | 1269 | </p> |
1264 | 1270 | </div> |
1265 | 1271 | <?php |
… |
… |
function bp_the_thread_message_sender_avatar( $args = '' ) { |
1804 | 1810 | * Filters the avatar for the current message sender. |
1805 | 1811 | * |
1806 | 1812 | * @since 1.1.0 |
| 1813 | * @since 2.6.0 Added the `$r` parameter. |
1807 | 1814 | * |
1808 | 1815 | * @param string $value <img> tag containing the avatar value. |
| 1816 | * @param array $r Array of parsed arguments. |
1809 | 1817 | */ |
1810 | 1818 | return apply_filters( 'bp_get_the_thread_message_sender_avatar_thumb', bp_core_fetch_avatar( array( |
1811 | 1819 | 'item_id' => $thread_template->message->sender_id, |
… |
… |
function bp_the_thread_message_sender_avatar( $args = '' ) { |
1813 | 1821 | 'width' => $r['width'], |
1814 | 1822 | 'height' => $r['height'], |
1815 | 1823 | 'alt' => bp_core_get_user_displayname( $thread_template->message->sender_id ) |
1816 | | ) ) ); |
| 1824 | ) ), $r ); |
1817 | 1825 | } |
1818 | 1826 | |
1819 | 1827 | /** |