Commit c8fab4ac authored by lucha's avatar lucha
Browse files

[auto] plugin: buddypress 2.9.1

parent d668b6dd
.akismet-status { .akismet-status {
float: left; float: left;
} }
.akismet-status a { .akismet-status a {
color: #AAA; color: #aaa;
font-style: italic; font-style: italic;
} }
.akismet-history { .akismet-history {
margin: 13px; margin: 13px;
} }
.akismet-history div { .akismet-history div {
margin-bottom: 13px; margin-bottom: 13px;
} }
.akismet-history span { .akismet-history span {
color: #999; color: #999;
} }
...@@ -18,36 +22,43 @@ ...@@ -18,36 +22,43 @@
#wp-bp-activities-wrap { #wp-bp-activities-wrap {
padding: 5px 0; padding: 5px 0;
} }
#bp-activities { #bp-activities {
height: 120px; height: 120px;
} }
#bp-replyhead { #bp-replyhead {
font-size: 1em; font-size: 1em;
line-height: 1.4em; line-height: 1.4;
margin: 0; margin: 0;
} }
#bp-replysubmit { #bp-replysubmit {
margin: 0; margin: 0;
padding: 0 0 3px; padding: 0 0 3px;
text-align: center; text-align: center;
} }
#bp-replysubmit .error { #bp-replysubmit .error {
color: red; color: #f00;
line-height: 21px; line-height: 21px;
text-align: center; text-align: center;
vertical-align: center; vertical-align: center;
} }
#bp-replysubmit img.waiting { #bp-replysubmit img.waiting {
float: left; float: left;
padding: 4px 10px 0; padding: 4px 10px 0;
vertical-align: top; vertical-align: top;
} }
#bp-activities-form .column-response img { #bp-activities-form .column-response img {
float: right; float: right;
margin-bottom: 5px; margin-bottom: 5px;
margin-left: 10px; margin-left: 10px;
margin-top: 1px; margin-top: 1px;
} }
.activity-errors { .activity-errors {
list-style-type: disc; list-style-type: disc;
margin-right: 2em; margin-right: 2em;
...@@ -57,31 +68,38 @@ ...@@ -57,31 +68,38 @@
#bp_activity_content div.inside { #bp_activity_content div.inside {
line-height: 0; line-height: 0;
} }
#bp_activity_action h3, #bp_activity_action h3,
#bp_activity_content h3 { #bp_activity_content h3 {
cursor: auto; cursor: auto;
} }
#bp_activity_action td.mceIframeContainer, #bp_activity_action td.mceIframeContainer,
#bp_activity_content td.mceIframeContainer { #bp_activity_content td.mceIframeContainer {
background-color: white; background-color: #fff;
} }
#post-body #bp-activities-action_resize, #post-body #bp-activities-action_resize,
#post-body #bp-activities-content_resize { #post-body #bp-activities-content_resize {
position: inherit; position: inherit;
margin-top: -2px; margin-top: -2px;
} }
#bp_activity_link input { #bp_activity_link input {
width: 99%; width: 99%;
} }
#bp-activities-primaryid { #bp-activities-primaryid {
margin-bottom: 1em; margin-bottom: 1em;
} }
.column-action { .column-action {
width: 12%; width: 12%;
} }
@media screen and (max-width: 782px) { @media screen and (max-width: 782px) {
body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) { body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) {
display: table-cell; display: table-cell;
} }
} }
\ No newline at end of file
.akismet-status{float:left}.akismet-status a{color:#AAA;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:left;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:right;margin-bottom:5px;margin-left:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-right:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:#fff}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%}@media screen and (max-width:782px){body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){display:table-cell}} .akismet-status{float:left}.akismet-status a{color:#aaa;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:left;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:right;margin-bottom:5px;margin-left:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-right:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:#fff}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%}@media screen and (max-width:782px){body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){display:table-cell}}
\ No newline at end of file \ No newline at end of file
.akismet-status { .akismet-status {
float: right; float: right;
} }
.akismet-status a { .akismet-status a {
color: #AAA; color: #aaa;
font-style: italic; font-style: italic;
} }
.akismet-history { .akismet-history {
margin: 13px; margin: 13px;
} }
.akismet-history div { .akismet-history div {
margin-bottom: 13px; margin-bottom: 13px;
} }
.akismet-history span { .akismet-history span {
color: #999; color: #999;
} }
...@@ -18,36 +22,43 @@ ...@@ -18,36 +22,43 @@
#wp-bp-activities-wrap { #wp-bp-activities-wrap {
padding: 5px 0; padding: 5px 0;
} }
#bp-activities { #bp-activities {
height: 120px; height: 120px;
} }
#bp-replyhead { #bp-replyhead {
font-size: 1em; font-size: 1em;
line-height: 1.4em; line-height: 1.4;
margin: 0; margin: 0;
} }
#bp-replysubmit { #bp-replysubmit {
margin: 0; margin: 0;
padding: 0 0 3px; padding: 0 0 3px;
text-align: center; text-align: center;
} }
#bp-replysubmit .error { #bp-replysubmit .error {
color: red; color: #f00;
line-height: 21px; line-height: 21px;
text-align: center; text-align: center;
vertical-align: center; vertical-align: center;
} }
#bp-replysubmit img.waiting { #bp-replysubmit img.waiting {
float: right; float: right;
padding: 4px 10px 0; padding: 4px 10px 0;
vertical-align: top; vertical-align: top;
} }
#bp-activities-form .column-response img { #bp-activities-form .column-response img {
float: left; float: left;
margin-bottom: 5px; margin-bottom: 5px;
margin-right: 10px; margin-right: 10px;
margin-top: 1px; margin-top: 1px;
} }
.activity-errors { .activity-errors {
list-style-type: disc; list-style-type: disc;
margin-left: 2em; margin-left: 2em;
...@@ -57,31 +68,38 @@ ...@@ -57,31 +68,38 @@
#bp_activity_content div.inside { #bp_activity_content div.inside {
line-height: 0; line-height: 0;
} }
#bp_activity_action h3, #bp_activity_action h3,
#bp_activity_content h3 { #bp_activity_content h3 {
cursor: auto; cursor: auto;
} }
#bp_activity_action td.mceIframeContainer, #bp_activity_action td.mceIframeContainer,
#bp_activity_content td.mceIframeContainer { #bp_activity_content td.mceIframeContainer {
background-color: white; background-color: #fff;
} }
#post-body #bp-activities-action_resize, #post-body #bp-activities-action_resize,
#post-body #bp-activities-content_resize { #post-body #bp-activities-content_resize {
position: inherit; position: inherit;
margin-top: -2px; margin-top: -2px;
} }
#bp_activity_link input { #bp_activity_link input {
width: 99%; width: 99%;
} }
#bp-activities-primaryid { #bp-activities-primaryid {
margin-bottom: 1em; margin-bottom: 1em;
} }
.column-action { .column-action {
width: 12%; width: 12%;
} }
@media screen and (max-width: 782px) { @media screen and (max-width: 782px) {
body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) { body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column) {
display: table-cell; display: table-cell;
} }
} }
\ No newline at end of file
.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:left;margin-bottom:5px;margin-right:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-left:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:#fff}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%}@media screen and (max-width:782px){body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){display:table-cell}} .akismet-status{float:right}.akismet-status a{color:#aaa;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:left;margin-bottom:5px;margin-right:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-left:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:#fff}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%}@media screen and (max-width:782px){body.toplevel_page_bp-activity .wp-list-table tr:not(.inline-edit-row):not(.no-items) td:not(.check-column){display:table-cell}}
\ No newline at end of file \ No newline at end of file
!function(a){var b={init:function(){a(document).on("click",".row-actions a.reply",b.open),a(document).on("click","#bp-activities-container a.cancel",b.close),a(document).on("click","#bp-activities-container a.save",b.send),a(document).on("keyup","#bp-activities:visible",function(a){27===a.which&&b.close()})},open:function(){var b=a("#bp-activities-container").hide();return a(this).parents("tr").after(b),b.fadeIn("300"),a("#bp-activities").focus(),!1},close:function(){return a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur(),a("#bp-replysubmit .error").html("").hide(),a("#bp-replysubmit .waiting").hide()}),!1},send:function(){a("#bp-replysubmit .error").hide(),a("#bp-replysubmit .waiting").show();var c={};return c["_ajax_nonce-bp-activity-admin-reply"]=a('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val(),c.action="bp-activity-admin-reply",c.content=a("#bp-activities").val(),c.parent_id=a("#bp-activities-container").prev().data("parent_id"),c.root_id=a("#bp-activities-container").prev().data("root_id"),a.ajax({data:c,type:"POST",url:ajaxurl,error:function(a){b.error(a)},success:function(a){b.show(a)}}),!1},error:function(b){var c=b.statusText;a("#bp-replysubmit .waiting").hide(),b.responseText&&(c=b.responseText.replace(/<.[^<>]*?>/g,"")),c&&a("#bp-replysubmit .error").html(c).show()},show:function(c){var d,e,f;return"string"==typeof c?(b.error({responseText:c}),!1):(f=wpAjax.parseAjaxResponse(c),f.errors?(b.error({responseText:wpAjax.broken}),!1):(f=f.responses[0],void a("#bp-activities-container").fadeOut("200",function(){a("#bp-activities").val("").blur(),a("#bp-replysubmit .error").html("").hide(),a("#bp-replysubmit .waiting").hide(),a("#bp-activities-container").before(f.data),e=a("#activity-"+f.id),d=e.closest(".widefat").css("backgroundColor"),e.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:d},300)})))}};a(document).ready(function(){b.init(),a("#bp_activity_action h3, #bp_activity_content h3").unbind("click"),"undefined"!=typeof postboxes&&postboxes.add_postbox_toggles(bp_activity_admin_vars.page)})}(jQuery); !function(i){var t={init:function(){i(document).on("click",".row-actions a.reply",t.open),i(document).on("click","#bp-activities-container a.cancel",t.close),i(document).on("click","#bp-activities-container a.save",t.send),i(document).on("keyup","#bp-activities:visible",function(i){27===i.which&&t.close()})},open:function(){var t=i("#bp-activities-container").hide();return i(this).parents("tr").after(t),t.fadeIn("300"),i("#bp-activities").focus(),!1},close:function(){return i("#bp-activities-container").fadeOut("200",function(){i("#bp-activities").val("").blur(),i("#bp-replysubmit .error").html("").hide(),i("#bp-replysubmit .waiting").hide()}),!1},send:function(){i("#bp-replysubmit .error").hide(),i("#bp-replysubmit .waiting").show();var e={};return e["_ajax_nonce-bp-activity-admin-reply"]=i('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val(),e.action="bp-activity-admin-reply",e.content=i("#bp-activities").val(),e.parent_id=i("#bp-activities-container").prev().data("parent_id"),e.root_id=i("#bp-activities-container").prev().data("root_id"),i.ajax({data:e,type:"POST",url:ajaxurl,error:function(i){t.error(i)},success:function(i){t.show(i)}}),!1},error:function(t){var e=t.statusText;i("#bp-replysubmit .waiting").hide(),t.responseText&&(e=t.responseText.replace(/<.[^<>]*?>/g,"")),e&&i("#bp-replysubmit .error").html(e).show()},show:function(e){var n,a,r;return"string"==typeof e?(t.error({responseText:e}),!1):(r=wpAjax.parseAjaxResponse(e)).errors?(t.error({responseText:wpAjax.broken}),!1):(r=r.responses[0],void i("#bp-activities-container").fadeOut("200",function(){i("#bp-activities").val("").blur(),i("#bp-replysubmit .error").html("").hide(),i("#bp-replysubmit .waiting").hide(),i("#bp-activities-container").before(r.data),a=i("#activity-"+r.id),n=a.closest(".widefat").css("backgroundColor"),a.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:n},300)}))}};i(document).ready(function(){t.init(),i("#bp_activity_action h3, #bp_activity_content h3").unbind("click"),"undefined"!=typeof postboxes&&postboxes.add_postbox_toggles(bp_activity_admin_vars.page)})}(jQuery);
\ No newline at end of file \ No newline at end of file
...@@ -141,7 +141,7 @@ add_action( 'wp_ajax_bp-activity-admin-reply', 'bp_activity_admin_reply' ); ...@@ -141,7 +141,7 @@ add_action( 'wp_ajax_bp-activity-admin-reply', 'bp_activity_admin_reply' );
* @param string $value Will always be false unless another plugin filters it first. * @param string $value Will always be false unless another plugin filters it first.
* @param string $option Screen option name. * @param string $option Screen option name.
* @param string $new_value Screen option form value. * @param string $new_value Screen option form value.
* @return string Option value. False to abandon update. * @return string|int Option value. False to abandon update.
*/ */
function bp_activity_admin_screen_options( $value, $option, $new_value ) { function bp_activity_admin_screen_options( $value, $option, $new_value ) {
if ( 'toplevel_page_bp_activity_per_page' != $option && 'toplevel_page_bp_activity_network_per_page' != $option ) if ( 'toplevel_page_bp_activity_per_page' != $option && 'toplevel_page_bp_activity_network_per_page' != $option )
......
...@@ -123,7 +123,7 @@ function bp_activity_embed_has_activity( $activity_id = 0 ) { ...@@ -123,7 +123,7 @@ function bp_activity_embed_has_activity( $activity_id = 0 ) {
* @since 2.6.0 * @since 2.6.0
*/ */
function bp_activity_embed_excerpt( $content = '' ) { function bp_activity_embed_excerpt( $content = '' ) {
echo bp_activity_get_embed_excerpt( $content = '' ); echo bp_activity_get_embed_excerpt( $content );
} }
/** /**
......
...@@ -207,10 +207,12 @@ function bp_activity_filter_kses( $content ) { ...@@ -207,10 +207,12 @@ function bp_activity_filter_kses( $content ) {
global $allowedtags; global $allowedtags;
$activity_allowedtags = $allowedtags; $activity_allowedtags = $allowedtags;
$activity_allowedtags['a']['class'] = array(); $activity_allowedtags['a']['aria-label'] = array();
$activity_allowedtags['a']['id'] = array(); $activity_allowedtags['a']['class'] = array();
$activity_allowedtags['a']['rel'] = array(); $activity_allowedtags['a']['data-bp-tooltip'] = array();
$activity_allowedtags['a']['title'] = array(); $activity_allowedtags['a']['id'] = array();
$activity_allowedtags['a']['rel'] = array();
$activity_allowedtags['a']['title'] = array();
$activity_allowedtags['b'] = array(); $activity_allowedtags['b'] = array();
$activity_allowedtags['code'] = array(); $activity_allowedtags['code'] = array();
...@@ -223,12 +225,14 @@ function bp_activity_filter_kses( $content ) { ...@@ -223,12 +225,14 @@ function bp_activity_filter_kses( $content ) {
$activity_allowedtags['img']['height'] = array(); $activity_allowedtags['img']['height'] = array();
$activity_allowedtags['img']['class'] = array(); $activity_allowedtags['img']['class'] = array();
$activity_allowedtags['img']['id'] = array(); $activity_allowedtags['img']['id'] = array();
$activity_allowedtags['img']['title'] = array();
$activity_allowedtags['span'] = array(); $activity_allowedtags['span'] = array();
$activity_allowedtags['span']['class'] = array(); $activity_allowedtags['span']['class'] = array();
$activity_allowedtags['span']['data-livestamp'] = array(); $activity_allowedtags['span']['data-livestamp'] = array();
$activity_allowedtags['ul'] = array();
$activity_allowedtags['ol'] = array();
$activity_allowedtags['li'] = array();
/** /**
* Filters the allowed HTML tags for BuddyPress Activity content. * Filters the allowed HTML tags for BuddyPress Activity content.
......
...@@ -1845,7 +1845,7 @@ function bp_activity_get_specific( $args = '' ) { ...@@ -1845,7 +1845,7 @@ function bp_activity_get_specific( $args = '' ) {
* @type bool $is_spam Should the item be marked as spam? Default: false. * @type bool $is_spam Should the item be marked as spam? Default: false.
* @type string $error_type Optional. Error type. Either 'bool' or 'wp_error'. Default: 'bool'. * @type string $error_type Optional. Error type. Either 'bool' or 'wp_error'. Default: 'bool'.
* } * }
* @return int|bool The ID of the activity on success. False on error. * @return WP_Error|bool|int The ID of the activity on success. False on error.
*/ */
function bp_activity_add( $args = '' ) { function bp_activity_add( $args = '' ) {
...@@ -2026,7 +2026,7 @@ function bp_activity_post_update( $args = '' ) { ...@@ -2026,7 +2026,7 @@ function bp_activity_post_update( $args = '' ) {
* @param int $post_id ID of the new post. * @param int $post_id ID of the new post.
* @param WP_Post|null $post Post object. * @param WP_Post|null $post Post object.
* @param int $user_id ID of the post author. * @param int $user_id ID of the post author.
* @return int|bool The ID of the activity on success. False on error. * @return null|WP_Error|bool|int The ID of the activity on success. False on error.
*/ */
function bp_activity_post_type_publish( $post_id = 0, $post = null, $user_id = 0 ) { function bp_activity_post_type_publish( $post_id = 0, $post = null, $user_id = 0 ) {
...@@ -2161,7 +2161,7 @@ function bp_activity_post_type_publish( $post_id = 0, $post = null, $user_id = 0 ...@@ -2161,7 +2161,7 @@ function bp_activity_post_type_publish( $post_id = 0, $post = null, $user_id = 0
* @since 2.2.0 * @since 2.2.0
* *
* @param WP_Post|null $post Post item. * @param WP_Post|null $post Post item.
* @return bool True on success, false on failure. * @return null|WP_Error|bool True on success, false on failure.
*/ */
function bp_activity_post_type_update( $post = null ) { function bp_activity_post_type_update( $post = null ) {
...@@ -2283,7 +2283,7 @@ function bp_activity_post_type_unpublish( $post_id = 0, $post = null ) { ...@@ -2283,7 +2283,7 @@ function bp_activity_post_type_unpublish( $post_id = 0, $post = null ) {
* @param int $comment_id ID of the comment. * @param int $comment_id ID of the comment.
* @param bool $is_approved Whether the comment is approved or not. * @param bool $is_approved Whether the comment is approved or not.
* @param object|null $activity_post_object The post type tracking args object. * @param object|null $activity_post_object The post type tracking args object.
* @return int|bool The ID of the activity on success. False on error. * @return null|WP_Error|bool|int The ID of the activity on success. False on error.
*/ */
function bp_activity_post_type_comment( $comment_id = 0, $is_approved = true, $activity_post_object = null ) { function bp_activity_post_type_comment( $comment_id = 0, $is_approved = true, $activity_post_object = null ) {
// Get the users comment // Get the users comment
...@@ -2557,7 +2557,7 @@ add_action( 'delete_comment', 'bp_activity_post_type_remove_comment', 10, 1 ); ...@@ -2557,7 +2557,7 @@ add_action( 'delete_comment', 'bp_activity_post_type_remove_comment', 10, 1 );
* Defaults to false. * Defaults to false.
* @type string $error_type Optional. Error type. Either 'bool' or 'wp_error'. Default: 'bool'. * @type string $error_type Optional. Error type. Either 'bool' or 'wp_error'. Default: 'bool'.
* } * }
* @return int|bool The ID of the comment on success, otherwise false. * @return WP_Error|bool|int The ID of the comment on success, otherwise false.
*/ */
function bp_activity_new_comment( $args = '' ) { function bp_activity_new_comment( $args = '' ) {
$bp = buddypress(); $bp = buddypress();
...@@ -2963,6 +2963,12 @@ function bp_activity_delete_comment( $activity_id, $comment_id ) { ...@@ -2963,6 +2963,12 @@ function bp_activity_delete_comment( $activity_id, $comment_id ) {
return $deleted; return $deleted;
} }
// Check if comment still exists.
$comment = new BP_Activity_Activity( $comment_id );
if ( empty( $comment->id ) ) {
return false;
}
// Delete any children of this comment. // Delete any children of this comment.
bp_activity_delete_children( $activity_id, $comment_id ); bp_activity_delete_children( $activity_id, $comment_id );
...@@ -3003,6 +3009,11 @@ function bp_activity_delete_comment( $activity_id, $comment_id ) { ...@@ -3003,6 +3009,11 @@ function bp_activity_delete_comment( $activity_id, $comment_id ) {
* @param int $comment_id The ID of the comment to be deleted. * @param int $comment_id The ID of the comment to be deleted.
*/ */
function bp_activity_delete_children( $activity_id, $comment_id ) { function bp_activity_delete_children( $activity_id, $comment_id ) {
// Check if comment still exists.
$comment = new BP_Activity_Activity( $comment_id );
if ( empty( $comment->id ) ) {
return;
}
// Get activity children to delete. // Get activity children to delete.
$children = BP_Activity_Activity::get_child_comments( $comment_id ); $children = BP_Activity_Activity::get_child_comments( $comment_id );
......
...@@ -94,7 +94,7 @@ function bp_activity_format_notifications( $action, $item_id, $secondary_item_id ...@@ -94,7 +94,7 @@ function bp_activity_format_notifications( $action, $item_id, $secondary_item_id
* @param int $activity_id ID of the activity item being formatted. * @param int $activity_id ID of the activity item being formatted.
* @param int $user_id ID of the user who inited the interaction. * @param int $user_id ID of the user who inited the interaction.
*/ */
$return = apply_filters( 'bp_activity_' . $amount . '_' . $action_filter . '_notification', '<a href="' . esc_url( $link ) . '" title="' . esc_attr( $title ) . '">' . esc_html( $text ) . '</a>', $link, (int) $total_items, $activity_id, $user_id ); $return = apply_filters( 'bp_activity_' . $amount . '_' . $action_filter . '_notification', '<a href="' . esc_url( $link ) . '">' . esc_html( $text ) . '</a>', $link, (int) $total_items, $activity_id, $user_id );
} else { } else {
/** /**
......
...@@ -1493,7 +1493,7 @@ function bp_insert_activity_meta( $content = '' ) { ...@@ -1493,7 +1493,7 @@ function bp_insert_activity_meta( $content = '' ) {
// Setup variables for activity meta. // Setup variables for activity meta.
$activity_permalink = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ); $activity_permalink = bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity );
$activity_meta = sprintf( '%1$s <a href="%2$s" class="view activity-time-since" title="%3$s">%4$s</a>', $activity_meta = sprintf( '%1$s <a href="%2$s" class="view activity-time-since bp-tooltip" data-bp-tooltip="%3$s">%4$s</a>',
$new_content, $new_content,
$activity_permalink, $activity_permalink,
esc_attr__( 'View Discussion', 'buddypress' ),