<!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][11940] trunk/src: Core: deprecate functions soft-removed in BP 2.6</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 { white-space: pre-line; 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/11940">11940</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/11940","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>2018-04-03 10:47:52 +0000 (Tue, 03 Apr 2018)</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'>Core: deprecate functions soft-removed in BP 2.6
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7738">#7738</a>
Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoredeprecated30php">trunk/src/bp-core/deprecated/3.0.php</a></li>
<li><a href="#trunksrcbpmembersclassesclassbpmemberscomponentphp">trunk/src/bp-members/classes/class-bp-members-component.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersactionsphp">trunk/src/bp-members/bp-members-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoredeprecated30php"></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/deprecated/3.0.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/3.0.php 2018-04-03 00:36:56 UTC (rev 11939)
+++ trunk/src/bp-core/deprecated/3.0.php 2018-04-03 10:47:52 UTC (rev 11940)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,5 +83,100 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_group_new_topic_button( $group = false ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _deprecated_function( __FUNCTION__, '3.0', 'legacy forum support removed' );
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Catch a "Mark as Spammer/Not Spammer" click from the toolbar.
+ *
+ * When a site admin selects "Mark as Spammer/Not Spammer" from the admin menu
+ * this action will fire and mark or unmark the user and their blogs as spam.
+ * Must be a site admin for this function to run.
+ *
+ * Note: no longer used in the current state. See the Settings component.
+ *
+ * @since 1.1.0
+ * @since 1.6.0 No longer used, unhooked.
+ * @since 3.0.0 Formally marked as deprecated.
+ *
+ * @param int $user_id Optional. User ID to mark as spam. Defaults to displayed user.
+ */
+function bp_core_action_set_spammer_status( $user_id = 0 ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ // Only super admins can currently spam users (but they can't spam
+ // themselves).
+ if ( ! is_super_admin() || bp_is_my_profile() ) {
+ return;
+ }
+
+ // Use displayed user if it's not yourself.
+ if ( empty( $user_id ) )
+ $user_id = bp_displayed_user_id();
+
+ if ( bp_is_current_component( 'admin' ) && ( in_array( bp_current_action(), array( 'mark-spammer', 'unmark-spammer' ) ) ) ) {
+
+ // Check the nonce.
+ check_admin_referer( 'mark-unmark-spammer' );
+
+ // To spam or not to spam.
+ $status = bp_is_current_action( 'mark-spammer' ) ? 'spam' : 'ham';
+
+ // The heavy lifting.
+ bp_core_process_spammer_status( $user_id, $status );
+
+ // Add feedback message. @todo - Error reporting.
+ if ( 'spam' == $status ) {
+ bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
+ } else {
+ bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
+ }
+
+ // Deprecated. Use bp_core_process_spammer_status.
+ $is_spam = 'spam' == $status;
+ do_action( 'bp_core_action_set_spammer_status', bp_displayed_user_id(), $is_spam );
+
+ // Redirect back to where we came from.
+ bp_core_redirect( wp_get_referer() );
+ }
+}
+
+/**
+ * Process user deletion requests.
+ *
+ * Note: no longer used in the current state. See the Settings component.
+ *
+ * @since 1.1.0
+ * @since 1.6.0 No longer used, unhooked.
+ * @since 3.0.0 Formally marked as deprecated.
+ */
+function bp_core_action_delete_user() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ if ( !bp_current_user_can( 'bp_moderate' ) || bp_is_my_profile() || !bp_displayed_user_id() )
+ return false;
+
+ if ( bp_is_current_component( 'admin' ) && bp_is_current_action( 'delete-user' ) ) {
+
+ // Check the nonce.
+ check_admin_referer( 'delete-user' );
+
+ $errors = false;
+ do_action( 'bp_core_before_action_delete_user', $errors );
+
+ if ( bp_core_delete_account( bp_displayed_user_id() ) ) {
+ bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), bp_get_displayed_user_fullname() ) );
+ } else {
+ bp_core_add_message( sprintf( __( 'There was an error deleting %s from the system. Please try again.', 'buddypress' ), bp_get_displayed_user_fullname() ), 'error' );
+ $errors = true;
+ }
+
+ do_action( 'bp_core_action_delete_user', $errors );
+
+ if ( $errors )
+ bp_core_redirect( bp_displayed_user_domain() );
+ else
+ bp_core_redirect( bp_loggedin_user_domain() );
+ }
+}
</ins></span></pre></div>
<a id="trunksrcbpmembersbpmembersactionsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-members/bp-members-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/bp-members-actions.php 2018-04-03 00:36:56 UTC (rev 11939)
+++ trunk/src/bp-members/bp-members-actions.php 2018-04-03 10:47:52 UTC (rev 11940)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,113 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * BuddyPress Members Actions.
- *
- * Action functions are exactly the same as screen functions, however they do not
- * have a template screen associated with them. Usually they will send the user
- * back to the default screen after execution.
- *
- * @package BuddyPress
- * @subpackage MembersActions
- * @since 1.5.0
- */
-
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Catch a "Mark as Spammer/Not Spammer" click from the toolbar.
- *
- * When a site admin selects "Mark as Spammer/Not Spammer" from the admin menu
- * this action will fire and mark or unmark the user and their blogs as spam.
- * Must be a site admin for this function to run.
- *
- * Note: no longer used in the current state. See the Settings component.
- *
- * @since 1.1.0
- *
- * @param int $user_id Optional. User ID to mark as spam. Defaults to displayed user.
- */
-function bp_core_action_set_spammer_status( $user_id = 0 ) {
-
- // Only super admins can currently spam users (but they can't spam
- // themselves).
- if ( ! is_super_admin() || bp_is_my_profile() ) {
- return;
- }
-
- // Use displayed user if it's not yourself.
- if ( empty( $user_id ) )
- $user_id = bp_displayed_user_id();
-
- if ( bp_is_current_component( 'admin' ) && ( in_array( bp_current_action(), array( 'mark-spammer', 'unmark-spammer' ) ) ) ) {
-
- // Check the nonce.
- check_admin_referer( 'mark-unmark-spammer' );
-
- // To spam or not to spam.
- $status = bp_is_current_action( 'mark-spammer' ) ? 'spam' : 'ham';
-
- // The heavy lifting.
- bp_core_process_spammer_status( $user_id, $status );
-
- // Add feedback message. @todo - Error reporting.
- if ( 'spam' == $status ) {
- bp_core_add_message( __( 'User marked as spammer. Spam users are visible only to site admins.', 'buddypress' ) );
- } else {
- bp_core_add_message( __( 'User removed as spammer.', 'buddypress' ) );
- }
-
- // Deprecated. Use bp_core_process_spammer_status.
- $is_spam = 'spam' == $status;
- do_action( 'bp_core_action_set_spammer_status', bp_displayed_user_id(), $is_spam );
-
- // Redirect back to where we came from.
- bp_core_redirect( wp_get_referer() );
- }
-}
-
-/*
- * Unhooked in 1.6.0 - moved to settings.
- * add_action( 'bp_actions', 'bp_core_action_set_spammer_status' );
- */
-
-/**
- * Process user deletion requests.
- *
- * Note: No longer called here. See the Settings component.
- *
- * @since 1.1.0
- */
-function bp_core_action_delete_user() {
-
- if ( !bp_current_user_can( 'bp_moderate' ) || bp_is_my_profile() || !bp_displayed_user_id() )
- return false;
-
- if ( bp_is_current_component( 'admin' ) && bp_is_current_action( 'delete-user' ) ) {
-
- // Check the nonce.
- check_admin_referer( 'delete-user' );
-
- $errors = false;
- do_action( 'bp_core_before_action_delete_user', $errors );
-
- if ( bp_core_delete_account( bp_displayed_user_id() ) ) {
- bp_core_add_message( sprintf( __( '%s has been deleted from the system.', 'buddypress' ), bp_get_displayed_user_fullname() ) );
- } else {
- bp_core_add_message( sprintf( __( 'There was an error deleting %s from the system. Please try again.', 'buddypress' ), bp_get_displayed_user_fullname() ), 'error' );
- $errors = true;
- }
-
- do_action( 'bp_core_action_delete_user', $errors );
-
- if ( $errors )
- bp_core_redirect( bp_displayed_user_domain() );
- else
- bp_core_redirect( bp_loggedin_user_domain() );
- }
-}
-
-/*
- * Unhooked in 1.6.0 - moved to settings
- * add_action( 'bp_actions', 'bp_core_action_delete_user' );
- */
</del></span></pre></div>
<a id="trunksrcbpmembersclassesclassbpmemberscomponentphp"></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/classes/class-bp-members-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/classes/class-bp-members-component.php 2018-04-03 00:36:56 UTC (rev 11939)
+++ trunk/src/bp-members/classes/class-bp-members-component.php 2018-04-03 10:47:52 UTC (rev 11940)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Always include these files.
</span><span class="cx" style="display: block; padding: 0 10px"> $includes = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'actions',
</del><span class="cx" style="display: block; padding: 0 10px"> 'filters',
</span><span class="cx" style="display: block; padding: 0 10px"> 'template',
</span><span class="cx" style="display: block; padding: 0 10px"> 'adminbar',
</span></span></pre>
</div>
</div>
</body>
</html>