Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/2.11'

  • Loading branch information...
commit cfc5c7b7d31509161aaf4bcb5f81b575e0243679 2 parents 23b4ab0 + 6dc5771
@alexkingorg alexkingorg authored
View
58 README.md
@@ -3,7 +3,7 @@
**Tags:** comments, facebook, twitter, social, broadcast, import, integrate, integration
**Requires at least:** 3.8
**Tested up to:** 3.8
-**Stable tag:** 2.10
+**Stable tag:** 2.11
**License:** GPLv2
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html
@@ -72,7 +72,7 @@ We recommend using CSS styles to selectively change the look and feel of your co
The icons used for the plugin are currently 16x16 pixels, and reside in a vertical sprite with each icon at 100px intervals. Adhering to these intervals will ensure that icon positions will not need to change
-**Note:** we do not recommend making changes to the included plugin files as they may be overwritten during an upgrade.
+Note: we do not recommend making changes to the included plugin files as they may be overwritten during an upgrade.
### Can I define a custom comments.php for Social? ###
@@ -115,7 +115,7 @@ These are performed using cron jobs noted below.
When the aggregation process runs Social uses the Facebook and Twitter search APIs to aggregate comments to the system.
-**For Twitter, Social first searches for retweets and mentions of the broadcasted tweet using the following API calls:** /statuses/retweets/:id, /statuses/mentions. Social then stores those IDs in a collection of aggregated comments. Social then hits Twitter's search API and searches by URL for tweets that contain a link to the blog post. Social then iterates over the search results and adds them to the collection, if the tweet does not already exist in the collection.
+For Twitter, Social first searches for retweets and mentions of the broadcasted tweet using the following API calls: /statuses/retweets/:id, /statuses/mentions. Social then stores those IDs in a collection of aggregated comments. Social then hits Twitter's search API and searches by URL for tweets that contain a link to the blog post. Social then iterates over the search results and adds them to the collection, if the tweet does not already exist in the collection.
For Facebook, Social first uses the Facebook search API to find any post that has the http://example.com?p=:id, the permalink generated by get_permalink($post_id) or the short link generated by the active short link delegate at the time the post was created. These posts are then stored in a collection. Next, Social loads the comments for the broadcasted post by calling http://graph.facebook.com/:id/comments. Social then iterates over the search results and adds them to the collection, if the comment does not already exist in the collection.
@@ -142,7 +142,7 @@ If you want to run system CRON jobs and disable Social's built in CRON jobs then
If you want to hook into a CRON for extra functionality for a service, all you have to do is add an action:
- <?php add_action('social_cron_15', array('Your_Class', 'your_method')); ?>
+ <?php add_action('socialcron15', array('Your_Class', 'your_method')); ?>
### Does the proxy application have access to my passwords now? ###
@@ -164,7 +164,7 @@ Invalid post that will not included:
http://example.com/?p=5 This was a cool post, go read it.
-**Track this bug on Facebook:** http://bugs.developers.facebook.net/show_bug.cgi?id=20611
+Track this bug on Facebook: http://bugs.developers.facebook.net/show_bug.cgi?id=20611
### Why are some of comments/posts not returning from Facebook right away? ###
@@ -183,8 +183,8 @@ This is due to the fact that older versions of WordPress did not remove apostrop
Social uses the core WordPress shortlink feature when broadcasting blog posts. Any plugin that interacts with the shortlink will also be reflected in Social's broadcasts.
-**wp_get_shortlink Documentation:** http://codex.wordpress.org/Function_Reference/wp_get_shortlink
-**Bit.ly Plugin:** http://wordpress.org/extend/plugins/bitly-shortlinks/
+wp_get_shortlink Documentation: http://codex.wordpress.org/Function_Reference/wp_get_shortlink
+Bit.ly Plugin: http://wordpress.org/extend/plugins/bitly-shortlinks/
When using the Bit.ly plugin, you will need to add the following to your wp-config.php to get it working:
@@ -207,7 +207,7 @@ The proxy Social connects to requires your website to be publicly accessible to
You can install the "Subscribe to Comments Reloaded" plugin written by coolman (http://profiles.wordpress.org/users/coolmann/).
-**Download:** http://wordpress.org/extend/plugins/subscribe-to-comments-reloaded/
+Download: http://wordpress.org/extend/plugins/subscribe-to-comments-reloaded/
### I occasionally receive a PHP notice of "Undefined property: WP_Http_Curl::$headers", what does this mean? ###
@@ -215,7 +215,7 @@ This is actually a bug in the WordPress core. This will be fixed in WordPress 3.
### I occasionally receive a PHP Warning of "Missing argument 5 for Social::get_avatar()", what does this mean? ###
-**You are likely using the add-local-avatars plugin here :** http://wordpress.org/extend/plugins/add-local-avatar/
+You are likely using the add-local-avatars plugin here : http://wordpress.org/extend/plugins/add-local-avatar/
This plugin incorrectly calls the `get_avatar` filter.
@@ -233,7 +233,7 @@ Accounts can not be authorized on local environments, unless your local environm
This is because we completely refactored Social's codebase for 2.0. Chances are your old comments template is using some code that we removed in 2.0. For now you should be able to use the built in Social comments template, but if you want to continue using your old template, we suggest you take a look at social/views/comments.php to see how the new implementation works.
-**For a more in-depth look at what you need to be aware of when upgrading from 1.x to 2.0 please have a look at the wiki entry:** https://github.com/crowdfavorite/wp-social/wiki/Upgrading-from-1.x-to-2.0
+For a more in-depth look at what you need to be aware of when upgrading from 1.x to 2.0 please have a look at the wiki entry: https://github.com/crowdfavorite/wp-social/wiki/Upgrading-from-1.x-to-2.0
### How do I include Facebook Likes and Twitter Retweets in my comments feed? ###
@@ -267,29 +267,39 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
add_action('social_approve_likes_and_retweets', '__return_true');
+### Why are there broken user images/avatars on comments imported from Twitter? ###
+
+Much to the consternation of developers everywhere, Twitter provides direct CDN URLs for its user profile images. This means that when someone changes their Twitter avatar, the old image URL may go dark. There is no "permalink" for a Twitter user avatar, so the best we can do is go back and update old comments to use the user's new avatar. There is a <a href="https://github.com/alexkingorg/wp-social-twitter-avatar-update">plugin for this</a>.
+
## Screenshots ##
###1. Allow your visitors to leave a comment as their Facebook or Twitter identities###
-![Allow your visitors to leave a comment as their Facebook or Twitter identities](http://s.wordpress.org/extend/plugins/social/screenshot-1.png)
+[missing image]
###2. Social settings screen to connect accounts, set up default broadcast settings and more###
-![Social settings screen to connect accounts, set up default broadcast settings and more](http://s.wordpress.org/extend/plugins/social/screenshot-2.png)
+[missing image]
+
+###3. Post edit screen settings: broadcast the post, manually import comments, view a log of imported items###
+[missing image]
-**3. Post edit screen settings:** broadcast the post, manually import comments, view a log of imported items
-###3. Send customized broadcasts to each social account###
-![Send customized broadcasts to each social account](http://s.wordpress.org/extend/plugins/social/screenshot-3.png)
+###4. Send customized broadcasts to each social account###
+[missing image]
-###4. View of replies imported from Twitter as comments###
-![View of replies imported from Twitter as comments](http://s.wordpress.org/extend/plugins/social/screenshot-4.png)
+###5. View of replies imported from Twitter as comments###
+[missing image]
## Upgrade Notice ##
+### 2.11 ###
+* (new) FAQ with link to plugin to update Twitter avatars for comments
+* (fix) Update the information about Social's CRON actions
+
### 2.10 ###
* (new) Now requires WordPress 3.8 (due to threaded comments walker change in WP core)
* (new) WP 3.8 admin refresh compatibility
@@ -302,6 +312,10 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
## Changelog ##
+### 2.11 ###
+* (new) FAQ with link to plugin to update Twitter avatars for comments
+* (fix) Update the information about Social's CRON actions
+
### 2.10 ###
* (new) Now requires WordPress 3.8 (due to threaded comments walker change in WP core)
* (new) WP 3.8 admin refresh compatibility
@@ -353,7 +367,7 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
* Now utilizes the newest Twitter API (1.1)
* Removed the discontinued Twitter @anywhere service
* Automatically approve Likes and Retweets
-*** New date format filters:** `social_formatted_date`, `social_comment_date`, `social_fuzzy_date`
+* New date format filters: `social_formatted_date`, `social_comment_date`, `social_fuzzy_date`
* XML-RPC / posts via email / scheduled posts now auto broadcast correctly
* Enable Pages support in user profile social accounts is working correctly
* Now utilizing longer timeouts for broadcast requests
@@ -401,10 +415,10 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
* New authentication scheme improves security.
* Manual comment check commands from the admin bar and posts list admin page.
* Improved queue and locking system to reduce the possibility of social reactions being imported twice.
-*** Filter:** social_broadcast_format now contains a third parameter, $service_key.
-*** Filter:** social_broadcast_permalink now contains a third parameter, $service_key.
-*** Filter:** social_format_content now contains a fourth parameter, $service_key.
-*** Filter:** social_broadcast_content_formatted now contains a third parameter, $service_key.
+* Filter: social_broadcast_format now contains a third parameter, $service_key.
+* Filter: social_broadcast_permalink now contains a third parameter, $service_key.
+* Filter: social_format_content now contains a fourth parameter, $service_key.
+* Filter: social_broadcast_content_formatted now contains a third parameter, $service_key.
### 1.0.2 ###
* Added the social_kses method to cleanse data coming back from the services.
View
16 README.txt
@@ -3,7 +3,7 @@ Contributors: crowdfavorite, alexkingorg
Tags: comments, facebook, twitter, social, broadcast, import, integrate, integration
Requires at least: 3.8
Tested up to: 3.8
-Stable tag: 2.10
+Stable tag: 2.11
License: GPLv2
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -142,7 +142,7 @@ If you want to run system CRON jobs and disable Social's built in CRON jobs then
If you want to hook into a CRON for extra functionality for a service, all you have to do is add an action:
- <?php add_action('social_cron_15', array('Your_Class', 'your_method')); ?>
+ <?php add_action('socialcron15', array('Your_Class', 'your_method')); ?>
= Does the proxy application have access to my passwords now? =
@@ -267,6 +267,10 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
add_action('social_approve_likes_and_retweets', '__return_true');
+= Why are there broken user images/avatars on comments imported from Twitter? =
+
+Much to the consternation of developers everywhere, Twitter provides direct CDN URLs for its user profile images. This means that when someone changes their Twitter avatar, the old image URL may go dark. There is no "permalink" for a Twitter user avatar, so the best we can do is go back and update old comments to use the user's new avatar. There is a <a href="https://github.com/alexkingorg/wp-social-twitter-avatar-update">plugin for this</a>.
+
== Screenshots ==
1. Allow your visitors to leave a comment as their Facebook or Twitter identities
@@ -282,6 +286,10 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
== Upgrade Notice ==
+= 2.11 =
+* (new) FAQ with link to plugin to update Twitter avatars for comments
+* (fix) Update the information about Social's CRON actions
+
= 2.10 =
* (new) Now requires WordPress 3.8 (due to threaded comments walker change in WP core)
* (new) WP 3.8 admin refresh compatibility
@@ -294,6 +302,10 @@ Since Social 2.9 we've made the decision to disable this by default. If the defa
== Changelog ==
+= 2.11 =
+* (new) FAQ with link to plugin to update Twitter avatars for comments
+* (fix) Update the information about Social's CRON actions
+
= 2.10 =
* (new) Now requires WordPress 3.8 (due to threaded comments walker change in WP core)
* (new) WP 3.8 admin refresh compatibility
View
2  lib/social/controller/cron.php
@@ -40,7 +40,7 @@ public function action_cron_15() {
$semaphore = Social_Semaphore::factory();
Social::log('Attempting semaphore lock');
if ($semaphore->lock()) {
- Social::log('Running social_cron_15_action.');
+ Social::log('Running socialcron15.');
do_action('socialcron15');
$semaphore->unlock();
}
View
4 social.php
@@ -3,7 +3,7 @@
Plugin Name: Social
Plugin URI: http://mailchimp.com/social-plugin-for-wordpress/
Description: Broadcast newly published posts and pull in discussions using integrations with Twitter and Facebook. Brought to you by <a href="http://mailchimp.com">MailChimp</a>.
-Version: 2.10
+Version: 2.11
Author: Crowd Favorite
Author URI: http://crowdfavorite.com/
*/
@@ -25,7 +25,7 @@
/**
* @var string version number
*/
- public static $version = '2.10';
+ public static $version = '2.11';
/**
* @var string CRON lock directory.
Please sign in to comment.
Something went wrong with that request. Please try again.