<!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][9843] trunk/src/bp-activity: Activity: Support only Akismet v3+.</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/9843">9843</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/9843","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>2015-05-06 22:23:53 +0000 (Wed, 06 May 2015)</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: Support only Akismet v3+.
For those using Akismet v3.0.x, notices started appearing due to Akismet
deprecating some older functions that were in use by the BP Activity
Akismet module.
Since Akismet 2.6.0 was released more than a year ago, we are upgrading
all calls in the BP Activity Akismet module to the new Akismet API. For
BuddyPress 2.3+, the BP Activity Akismet module will require at least
Akismet v3+.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6191">#6191</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="#trunksrcbpactivitybpactivityloaderphp">trunk/src/bp-activity/bp-activity-loader.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 2015-05-06 11:49:26 UTC (rev 9842)
+++ trunk/src/bp-activity/bp-activity-actions.php 2015-05-06 22:23:53 UTC (rev 9843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -712,17 +712,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Loads Akismet filtering for activity.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.6.0)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since BuddyPress (2.3.0) We only support Akismet 3+.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_setup_akismet() {
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if Akismet is not active
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! defined( 'AKISMET_VERSION' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! defined( 'AKISMET_VERSION' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Bail if older version of Akismet
+ if ( ! class_exists( 'Akismet' ) ) {
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Bail if no Akismet key is set
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_get_option( 'wordpress_api_key' ) && ! defined( 'WPCOM_API_KEY' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_get_option( 'wordpress_api_key' ) && ! defined( 'WPCOM_API_KEY' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><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"> * Filters if BuddyPress Activity Akismet support has been disabled by another plugin.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,8 +739,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $value Return value of bp_is_akismet_active boolean function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Instantiate Akismet for BuddyPress
</span><span class="cx" style="display: block; padding: 0 10px"> $bp->activity->akismet = new BP_Akismet();
</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 2015-05-06 11:49:26 UTC (rev 9842)
+++ trunk/src/bp-activity/bp-activity-akismet.php 2015-05-06 22:23:53 UTC (rev 9843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Akismet support for the Activity component.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.6.0)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since BuddyPress (2.3.0) We only support Akismet 3+.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class BP_Akismet {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['comment_type'] = $activity->type;
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['permalink'] = bp_activity_get_permalink( $activity->id, $activity );
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['user_ID'] = $userdata->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $activity_data['user_role'] = akismet_get_user_roles( $userdata->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity_data['user_role'] = Akismet::get_user_roles( $userdata->ID );
</ins><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"> * Get the nonce if the new activity was submitted through the "what's up, Paul?" form.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,9 +496,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.6.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $akismet_api_host
- * @global string $akismet_api_port
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param array $activity_data Packet of information to submit to Akismet.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $check "check" or "submit".
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $spam "spam" or "ham".
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -505,12 +503,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $activity_data Activity data, with Akismet data added.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function send_akismet_request( $activity_data, $check = 'check', $spam = 'spam' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $akismet_api_host, $akismet_api_port;
-
- // Check that host and port are set, if not, set them
- if ( function_exists( 'akismet_init' ) && ( empty( $akismet_api_host ) || empty( $akismet_api_port ) ) )
- akismet_init();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $query_string = $path = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['blog'] = bp_get_option( 'home' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +512,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['user_agent'] = bp_core_current_user_ua();
</span><span class="cx" style="display: block; padding: 0 10px"> $activity_data['user_ip'] = bp_core_current_user_ip();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( akismet_test_mode() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( Akismet::is_test_mode() )
</ins><span class="cx" style="display: block; padding: 0 10px"> $activity_data['is_test'] = 'true';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through _POST args and rekey strings
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,13 +540,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query_string .= $key . '=' . urlencode( stripslashes( $data ) ) . '&';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'check' == $check )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = '/1.1/comment-check';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = 'comment-check';
</ins><span class="cx" style="display: block; padding: 0 10px"> elseif ( 'submit' == $check )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = '/1.1/submit-' . $spam;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = 'submit-' . $spam;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send to Akismet
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = akismet_http_post( $query_string, $akismet_api_host, $path, $akismet_api_port );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = Akismet::http_post( $query_string, $path );
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the response
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,7 +626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $event = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'event' => $event,
</span><span class="cx" style="display: block; padding: 0 10px"> 'message' => $message,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'time' => akismet_microtime(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'time' => Akismet::_get_microtime(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'user' => bp_loggedin_user_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbpactivitybpactivityloaderphp"></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-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-loader.php 2015-05-06 11:49:26 UTC (rev 9842)
+++ trunk/src/bp-activity/bp-activity-loader.php 2015-05-06 22:23:53 UTC (rev 9843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in bp-activity/bp-activity-actions.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'AKISMET_VERSION' ) && ( !empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; 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() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $includes[] = 'akismet';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>