Changeset 826742
- Timestamp:
- 12/21/2013 09:19:43 PM (11 years ago)
- Location:
- social/trunk
- Files:
-
- 3 added
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
social/trunk/README.txt
r735561 r826742 2 2 Contributors: crowdfavorite, alexkingorg 3 3 Tags: comments, facebook, twitter, social, broadcast, import, integrate, integration 4 Requires at least: 3. 35 Tested up to: 3. 5.26 Stable tag: 2. 9.24 Requires at least: 3. 5 Tested up to: 3. 6 Stable tag: 2. 7 7 License: GPLv2 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 283 283 == Upgrade Notice == 284 284 285 = 2. 9.1=286 287 Fixes Facebook comment permalinks 288 289 = 2.9 = 290 291 This release adds a GUI option to enable/disable post types for social broadcasting, adds support for the new Facebook Pages threaded comments. 292 293 Also included are bugfixes, expanded language support, and other minor improvements. See the changelog for more detail. 285 = 2. = 286 * (new) Now requires WordPress 3.8 (due to threaded comments walker change in WP core) 287 * (new) WP 3.8 admin refresh compatibility 288 * (new) Japanese translation (thanks ToshiOshio) 289 * (fix) Work around changes in the Walker class in WP 3.8 so that nested comments appear as expected 290 * (fix) Remove underscores from CRON actions (thanks nddery) 291 * (fix) Work around MySQL bug #62077 (thanks DavidAnderson684) 292 * (fix) Compress images (thanks pathawks) 293 * (fix) use esc_url_raw() (thanks kanedo) 294 294 295 295 == Changelog == 296 297 298 299 300 301 302 303 304 305 296 306 297 307 = 2.9.2 = -
social/trunk/assets/admin.css
r643119 r826742 63 63 } 64 64 65 66 67 68 69 70 65 71 .social-accounts { 72 66 73 margin: 20px 0 0; 67 74 max-width: 60em; … … 81 88 82 89 .social-accounts ul li { 83 background: #fff;84 90 margin: 0; 85 91 padding: 0; … … 265 271 266 272 .social-collapsible > .social-title a { 267 background: #f ffurl(toggle.gif) no-repeat 0 0;273 background: #f url(toggle.gif) no-repeat 0 0; 268 274 display: -moz-inline-box; /* FF2 */ 269 275 display: inline-block; /* Standard. IE8+, Saf, FF3+ */ … … 609 615 610 616 /* Interstitial */ 617 618 619 620 611 621 .social-broadcast-options section { 612 622 margin-bottom: 30px; -
social/trunk/lib/social/controller/cron.php
r643119 r826742 42 42 if ($semaphore->lock()) { 43 43 Social::log('Running social_cron_15_action.'); 44 do_action('social _cron_15');44 do_action('social15'); 45 45 $semaphore->unlock(); 46 46 } … … 58 58 wp_die('Oops, invalid API key.'); 59 59 } 60 60 61 61 $crons = _get_cron_array(); 62 62 $social_crons = array( -
social/trunk/lib/social/controller/settings.php
r723283 r826742 65 65 66 66 // Unschedule the CRONs 67 if ($this->request->post('social_cron') != '1' and ($timestamp = wp_next_scheduled('social _cron_15_init')) !== false) {68 wp_unschedule_event($timestamp, 'social _cron_15_init');67 if ($this->request->post('social_cron') != '1' and ($timestamp = wp_next_scheduled('socialinit')) !== false) { 68 wp_unschedule_event($timestamp, 'socialinit'); 69 69 } 70 70 } -
social/trunk/lib/social/semaphore.php
r471325 r826742 163 163 164 164 $current_time = current_time('mysql', 1); 165 165 166 $affected = $wpdb->query($wpdb->prepare(" 166 167 UPDATE $wpdb->options 167 168 SET option_value = %s 168 169 WHERE option_name = 'social_last_lock_time' 169 AND option_value <= DATE_SUB(%s, INTERVAL 30 MINUTE)170 ", $current_time, $ current_time));170 AND option_value <= 171 ", $current_time, $_time)); 171 172 172 173 if ($affected == '1') { -
social/trunk/lib/social/service.php
r735561 r826742 401 401 } 402 402 $url = apply_filters('social_broadcast_permalink', $url, $post, $this); 403 $content = esc_url ($url);403 $content = esc_url($url); 404 404 break; 405 405 case '{title}': … … 409 409 $content = do_shortcode($post->post_content); 410 410 $content = htmlspecialchars_decode(strip_tags($content)); 411 411 412 break; 412 413 case '{author}': -
social/trunk/lib/social/walker/comment.php
r471325 r826742 23 23 break; 24 24 case 'ol': 25 echo"<ol class='social-children'>\n";25 "<ol class='social-children'>\n"; 26 26 break; 27 27 default: 28 28 case 'ul': 29 echo"<ul class='social-children'>\n";29 "<ul class='social-children'>\n"; 30 30 break; 31 31 } … … 47 47 break; 48 48 case 'ol': 49 echo"</ol>\n";49 "</ol>\n"; 50 50 break; 51 51 default: 52 52 case 'ul': 53 echo"</ul>\n";53 "</ul>\n"; 54 54 break; 55 55 } 56 56 57 echo"</li>\n";57 "</li>\n"; 58 58 } 59 59 -
social/trunk/social.php
r735561 r826742 4 4 Plugin URI: http://mailchimp.com/social-plugin-for-wordpress/ 5 5 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>. 6 Version: 2. 9.26 Version: 2. 7 7 Author: Crowd Favorite 8 8 Author URI: http://crowdfavorite.com/ … … 26 26 * @var string version number 27 27 */ 28 public static $version = '2. 9.2';28 public static $version = '2.'; 29 29 30 30 /** … … 490 490 // Schedule CRONs 491 491 if (Social::option('cron') == '1') { 492 if (wp_next_scheduled('social _cron_15_init') === false) {492 if (wp_next_scheduled('socialinit') === false) { 493 493 Social::log('Adding Social 15 CRON schedule'); 494 wp_schedule_event(time() + 900, 'every15min', 'social _cron_15_init');494 wp_schedule_event(time() + 900, 'every15min', 'socialinit'); 495 495 } 496 496 wp_remote_get( … … 1204 1204 * Sends a request to initialize CRON 15. 1205 1205 * 1206 * @wp-action social _cron_15_init1206 * @wp-action socialinit 1207 1207 * @return void 1208 1208 */ … … 1215 1215 * Runs the aggregation loop. 1216 1216 * 1217 * @wp-action social _cron_151217 * @wp-action social15 1218 1218 * @return void 1219 1219 */ … … 2320 2320 2321 2321 // CRON Actions 2322 add_action('social _cron_15_init', array($social, 'cron_15_init'));2322 add_action('socialinit', array($social, 'cron_15_init')); 2323 2323 if (Social::option('aggregate_comments')) { 2324 add_action('social _cron_15', array($social, 'run_aggregation'));2324 add_action('social15', array($social, 'run_aggregation')); 2325 2325 } 2326 2326 -
social/trunk/views/wp-admin/options.php
r723283 r826742 68 68 <td> 69 69 <input type="text" class="regular-text" name="social_broadcast_format" id="social_broadcast_format" value="<?php echo esc_attr(Social::option('broadcast_format')); ?>" /> 70 <p class="description "><?php _e('How you would like posts to be formatted when broadcasting to Twitter or Facebook?', 'social'); ?></p>70 <p class="description"><?php _e('How you would like posts to be formatted when broadcasting to Twitter or Facebook?', 'social'); ?></p> 71 71 72 72 <div class="description"> … … 93 93 <td> 94 94 <input type="text" class="regular-text" name="social_comment_broadcast_format" id="social_comment_broadcast_format" value="<?php echo esc_attr(Social::option('comment_broadcast_format')); ?>" /> 95 <p class="description "><?php _e('How you would like comments to be formatted when broadcasting to Twitter or Facebook.', 'social'); ?></p>95 <p class="description"><?php _e('How you would like comments to be formatted when broadcasting to Twitter or Facebook.', 'social'); ?></p> 96 96 97 97 <div class="description"> … … 110 110 </ul> 111 111 </div> 112 </td>113 </tr>114 <tr>115 <th><?php _e('Twitter @anywhere', 'social'); ?></th>116 <td>117 <p><?php printf(__('Social Version 2.6 has removed @anywhere support to comply with <a href="%s">Twitter\'s decision to sunset the service</a>.', 'social'), esc_url('https://dev.twitter.com/blog/sunsetting-anywhere')); ?></p>118 <p><?php printf(__('If you would like to continue to use @anywhere, <a href="%s" target="_blank">there are many plugins available to accomodate</a>.', 'social'), esc_url('https://www.google.com/search?q=WordPress+@anywhere+plugin')); ?></p>119 112 </td> 120 113 </tr> … … 167 160 </select> 168 161 </div> 169 <p class="description " style="max-width: 450px;"><?php _e('Account for general (non account specific) Twitter API interaction.', 'social'); ?></p>162 <p class="description" style="max-width: 450px;"><?php _e('Account for general (non account specific) Twitter API interaction.', 'social'); ?></p> 170 163 </li> 171 164 </ul> … … 180 173 <input type="radio" name="social_cron" value="1" id="cron_auto" style="position:relative;top:-1px"<?php echo Social::option('cron') == '1' ? ' checked="checked"' : ''; ?> /> 181 174 <?php _e('Automatic (WP Cron)', 'social'); ?> 182 <span class="description "><?php _e('(easiest)', 'social'); ?></span>175 <span class="description"><?php _e('(easiest)', 'social'); ?></span> 183 176 </label> 184 177 </li> … … 188 181 <?php _e('Manual <span class="description">(advanced)</span>', 'social'); ?> 189 182 </label> 190 <p class="description "><?php _e('If you select this option, new tweets and Facebook posts will not be fetched unless you set up a system CRON job or fetch new items manually from the post edit screen. More help is also available in <code>README.txt</code>.', 'social'); ?></p>183 <p class="description"><?php _e('If you select this option, new tweets and Facebook posts will not be fetched unless you set up a system CRON job or fetch new items manually from the post edit screen. More help is also available in <code>README.txt</code>.', 'social'); ?></p> 191 184 <?php 192 185 if (Social::option('cron') === '0') { -
social/trunk/views/wp-admin/parts/accounts.php
r617518 r826742 95 95 } 96 96 ?> 97 <p class="description " style="max-width: 450px;"><?php _e('Default accounts will auto-broadcast when you publish via XML-RPC or email.', 'social'); ?></p>97 <p class="description" style="max-width: 450px;"><?php _e('Default accounts will auto-broadcast when you publish via XML-RPC or email.', 'social'); ?></p>
Note: See TracChangeset
for help on using the changeset viewer.