<!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][11102] trunk/src/bp-activity: Activity: Move Akismet loader to `bp-activity-akismet.php`.</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" 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/11102">11102</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/11102","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-14 17:06:11 +0000 (Wed, 14 Sep 2016)</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'>Activity: Move Akismet loader to `bp-activity-akismet.php`.
Previously, `bp_activity_setup_akismet()` was placed in
`bp-activity-actions.php`. The actions file isn't a proper place to put
this code.
This commit moves this function to `bp-activity-akismet.php` and also
removes some duplicate conditional code. `BP_Activity_Component` already
checks if Akismet is loaded, so no need to re-duplicate this logic.
This is part of some prep work to conditionally load a component's action
and screen code when necessary.
See <a href="http://buddypress.trac.wordpress.org/ticket/7218">#7218</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityactionsphp">trunk/src/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunksrcbpactivitybpactivityakismetphp">trunk/src/bp-activity/bp-activity-akismet.php</a></li>
<li><a href="#trunksrcbpactivityclassesclassbpactivitycomponentphp">trunk/src/bp-activity/classes/class-bp-activity-component.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-actions.php 2016-09-14 02:06:10 UTC (rev 11101)
+++ trunk/src/bp-activity/bp-activity-actions.php 2016-09-14 17:06:11 UTC (rev 11102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,45 +605,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_actions', 'bp_activity_action_favorites_feed' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Loads Akismet filtering for activity.
- *
- * @since 1.6.0
- * @since 2.3.0 We only support Akismet 3+.
- */
-function bp_activity_setup_akismet() {
- $bp = buddypress();
-
- // Bail if Akismet is not active.
- if ( ! defined( 'AKISMET_VERSION' ) ) {
- return;
- }
-
- // Bail if older version of Akismet.
- if ( ! class_exists( 'Akismet' ) ) {
- return;
- }
-
- // Bail if no Akismet key is set.
- if ( ! bp_get_option( 'wordpress_api_key' ) && ! defined( 'WPCOM_API_KEY' ) ) {
- return;
- }
-
- /**
- * Filters if BuddyPress Activity Akismet support has been disabled by another plugin.
- *
- * @since 1.6.0
- *
- * @param bool $value Return value of bp_is_akismet_active boolean function.
- */
- if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
- return;
- }
-
- // Instantiate Akismet for BuddyPress.
- $bp->activity->akismet = new BP_Akismet();
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * AJAX endpoint for Suggestions API lookups.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.0
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-akismet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-akismet.php 2016-09-14 02:06:10 UTC (rev 11101)
+++ trunk/src/bp-activity/bp-activity-akismet.php 2016-09-14 17:06:11 UTC (rev 11102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Loads Akismet filtering for activity.
+ *
+ * @since 1.6.0
+ * @since 2.3.0 We only support Akismet 3+.
+ */
+function bp_activity_setup_akismet() {
+ /**
+ * Filters if BuddyPress Activity Akismet support has been disabled by another plugin.
+ *
+ * @since 1.6.0
+ *
+ * @param bool $value Return value of bp_is_akismet_active boolean function.
+ */
+ if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
+ return;
+ }
+
+ // Instantiate Akismet for BuddyPress.
+ buddypress()->activity->akismet = new BP_Akismet();
+}
+add_action( 'bp_activity_setup_globals', 'bp_activity_setup_akismet' );
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Delete old spam activity meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is done as a clean-up mechanism, as _bp_akismet_submission meta can
</span></span></pre></div>
<a id="trunksrcbpactivityclassesclassbpactivitycomponentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/classes/class-bp-activity-component.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/classes/class-bp-activity-component.php 2016-09-14 02:06:10 UTC (rev 11101)
+++ trunk/src/bp-activity/classes/class-bp-activity-component.php 2016-09-14 17:06:11 UTC (rev 11102)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Load Akismet support if Akismet is configured.
</span><span class="cx" style="display: block; padding: 0 10px"> $akismet_key = bp_get_option( 'wordpress_api_key' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /** This filter is documented in bp-activity/bp-activity-actions.php */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** This filter is documented in bp-activity/bp-activity-akismet.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'AKISMET_VERSION' ) && class_exists( 'Akismet' ) && ( ! empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $includes[] = 'akismet';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,19 +370,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Set up actions necessary for the component.
- *
- * @since 1.6.0
- */
- public function setup_actions() {
-
- // Spam prevention.
- add_action( 'bp_include', 'bp_activity_setup_akismet' );
-
- parent::setup_actions();
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Setup cache groups.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span></span></pre>
</div>
</div>
</body>
</html>