WordPress.org

Plugin Directory

Changeset 406596


Ignore:
Timestamp:
07/08/11 05:30:10 (3 years ago)
Author:
kirilln
Message:

3.3.12

  • Bug fix: error during activation "Fatal error: Cannot redeclare class Services_JSON in /.../wp-content/plugins/tweet-blender/lib/JSON.php on line 116" (thanks to Peter O for reporting via WP Support forum)
  • Bug fix: checkbox state was not shown as checked after settings were saved in admin (thanks to @JDub82 for reporting via Twitter)
Location:
tweet-blender/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • tweet-blender/trunk/admin-page.php

    r405901 r406596  
    11<?php 
    22 
    3 // Version 3.3.10 
     3// Version 3.3.12 
    44 
    55// include TweetBlender library 
     
    8484 
    8585    global $wp_json, $tb_option_names, $tb_option_names_system, $tb_keep_tweets_options, $tb_languages, $cache_clear_results, $tb_throttle_time_options, $tb_installed_addons, $tb_active_addons, $tb_package_names; 
    86  
    87     // if we don't have json class, get the library 
    88     if ( !is_a($wp_json, 'Services_JSON') ) { 
    89         if (file_exists(ABSPATH . WPINC . '/class-json.php')) { 
    90             require_once( ABSPATH . WPINC . '/class-json.php' ); 
    91         } 
    92         else { 
    93             require(dirname(__FILE__).'/lib/JSON.php'); 
    94         } 
    95         $wp_json = new Services_JSON(); 
    96     } 
    9786             
    9887    $upgrade_message = ''; 
     
    253242                $tb_o['filter_bad_strings'] = implode(',',$clean); 
    254243            } 
    255              
     244 
    256245            update_option('tweet-blender',$tb_o); 
    257246            // Put an options updated message on the screen 
     
    312301            <th class="th-full" colspan="2" scope="row"> 
    313302            <label for="general_link_urls"> 
    314             <input type="checkbox" name="general_link_urls" <?php checked('on', isset($tb_o['general_link_urls'])); ?>/> 
     303            <input type="checkbox" name="general_link_urls" <?php checked('on', $tb_o['general_link_urls']); ?>/> 
    315304            <?php _e("Link http &amp; https URLs insde tweet text", 'tweetblender' ); ?> 
    316305            </label> 
     
    320309            <th class="th-full" colspan="2" scope="row"> 
    321310            <label for="general_link_screen_names"> 
    322             <input type="checkbox" name="general_link_screen_names" <?php checked('on', isset($tb_o['general_link_screen_names'])); ?>/> 
     311            <input type="checkbox" name="general_link_screen_names" <?php checked('on', $tb_o['general_link_screen_names']); ?>/> 
    323312            <?php _e('Link @screenname inside tweet text', 'tweetblender' ); ?> 
    324313            </label> 
     
    328317            <th class="th-full" colspan="2" scope="row"> 
    329318            <label for="general_link_hash_tags"> 
    330             <input type="checkbox" name="general_link_hash_tags" <?php checked('on', isset($tb_o['general_link_hash_tags'])); ?>/> 
     319            <input type="checkbox" name="general_link_hash_tags" <?php checked('on', $tb_o['general_link_hash_tags']); ?>/> 
    331320            <?php _e("Link #hashtags insde tweet text", 'tweetblender' ); ?> 
    332321            </label> 
     
    337326            <h3><?php _e('SEO', 'tweetblender'); ?></h3> 
    338327            <label for="general_seo_tweets_googleoff"> 
    339             <input type="checkbox" name="general_seo_tweets_googleoff" <?php checked('on', isset($tb_o['general_seo_tweets_googleoff'])); ?>/> 
     328            <input type="checkbox" name="general_seo_tweets_googleoff" <?php checked('on', $tb_o['general_seo_tweets_googleoff']); ?>/> 
    340329            <?php _e('Wrap all tweets with googleoff/googleon tags to prevent indexing', 'tweetblender' ); ?> 
    341330            </label> 
     
    345334            <th class="th-full" colspan="2" scope="row"> 
    346335            <label for="general_seo_footer_googleoff"> 
    347             <input type="checkbox" name="general_seo_footer_googleoff" <?php checked('on', isset($tb_o['general_seo_footer_googleoff'])); ?>/> 
     336            <input type="checkbox" name="general_seo_footer_googleoff" <?php checked('on', $tb_o['general_seo_footer_googleoff']); ?>/> 
    348337            <?php _e('Wrap footer with date and time in all tweets with googleoff/googleon tags to prevent indexing', 'tweetblender' ); ?> 
    349338            </label> 
     
    359348            <th class="th-full" colspan="2" scope="row"> 
    360349            <label for="widget_check_sources"> 
    361             <input type="checkbox" name="widget_check_sources" <?php checked('on', isset($tb_o['widget_check_sources'])); ?>/> 
     350            <input type="checkbox" name="widget_check_sources" <?php checked('on', $tb_o['widget_check_sources']); ?>/> 
    362351            <?php _e("Check and verify sources when widget settings are saved", 'tweetblender' ); ?> 
    363352            </label> 
     
    367356            <th class="th-full" colspan="2" scope="row"> 
    368357            <label for="widget_show_header"> 
    369             <input type="checkbox" name="widget_show_header" <?php checked('on', isset($tb_o['widget_show_header'])); ?>/> 
     358            <input type="checkbox" name="widget_show_header" <?php checked('on', $tb_o['widget_show_header']); ?>/> 
    370359            <?php _e("Show header with Twitter logo and refresh link for each widget", 'tweetblender' ); ?> 
    371360            </label> 
     
    375364            <th class="th-full" colspan="2" scope="row"> 
    376365            <label for="widget_show_photos"> 
    377             <input type="checkbox" name="widget_show_photos" <?php checked('on', isset($tb_o['widget_show_photos'])); ?>/> 
     366            <input type="checkbox" name="widget_show_photos" <?php checked('on', $tb_o['widget_show_photos']); ?>/> 
    378367            <?php _e("Show the photo from the author for each tweet", 'tweetblender' ); ?> 
    379368            </label> 
     
    391380            <th class="th-full" colspan="2" scope="row"> 
    392381            <label for="widget_show_source"> 
    393             <input type="checkbox" name="widget_show_source" <?php checked('on', isset($tb_o['widget_show_source'])); ?>/> 
     382            <input type="checkbox" name="widget_show_source" <?php checked('on', $tb_o['widget_show_source']); ?>/> 
    394383            <?php _e("Show tweet source for each tweet", 'tweetblender' ); ?> 
    395384            </label> 
     
    399388            <th class="th-full" colspan="2" scope="row"> 
    400389            <label for="widget_show_reply_link"> 
    401             <input type="checkbox" name="widget_show_reply_link" <?php checked('on', isset($tb_o['widget_show_reply_link'])); ?>/> 
     390            <input type="checkbox" name="widget_show_reply_link" <?php checked('on', $tb_o['widget_show_reply_link']); ?>/> 
    402391            <?php _e("Show reply link for each tweet (on mouse over)", 'tweetblender' ); ?> 
    403392            </label> 
     
    407396            <th class="th-full" colspan="2" scope="row"> 
    408397            <label for="widget_show_follow_link"> 
    409             <input type="checkbox" name="widget_show_follow_link" <?php checked('on', isset($tb_o['widget_show_follow_link'])); ?>/> 
     398            <input type="checkbox" name="widget_show_follow_link" <?php checked('on', $tb_o['widget_show_follow_link']); ?>/> 
    410399            <?php _e("Show follow link for each tweet (on mouse over)", 'tweetblender' ); ?> 
    411400            </label> 
     
    421410            <th class="th-full" colspan="2" scope="row"> 
    422411            <label for="archive_is_disabled"> 
    423             <input type="checkbox" id="archive_is_disabled" name="archive_is_disabled" <?php checked('on', isset($tb_o['archive_is_disabled'])); ?>/> 
     412            <input type="checkbox" id="archive_is_disabled" name="archive_is_disabled" <?php checked('on', $tb_o['archive_is_disabled']); ?>/> 
    424413            <?php _e('Disable archive page', 'tweetblender' ); ?>  
    425414            </label> 
     
    429418            <th class="th-full" colspan="2" scope="row"> 
    430419            <label for="archive_auto_page"> 
    431             <input type="checkbox" id="archive_auto_page" name="archive_auto_page" <?php checked('on', isset($tb_o['archive_auto_page'])); ?>/> 
     420            <input type="checkbox" id="archive_auto_page" name="archive_auto_page" <?php checked('on', $tb_o['archive_auto_page']); ?>/> 
    432421            <?php _e('Create archive page automatically', 'tweetblender' ); ?>  
    433422            </label> 
     
    630619            <th class="th-full" colspan="2" scope="row"> 
    631620            <label for="advanced_reroute_on"> 
    632             <input type="checkbox" name="advanced_reroute_on" <?php checked('on', isset($tb_o['advanced_reroute_on'])); ?>/> 
     621            <input type="checkbox" name="advanced_reroute_on" <?php checked('on', $tb_o['advanced_reroute_on']); ?>/> 
    633622            <?php _e('Re-route Twitter traffic through this server', 'tweetblender' ); ?>  
    634623            </label> (<input type="radio" value="oauth" name="advanced_reroute_type" <?php checked('oauth', $tb_o['advanced_reroute_type']); ?>/> <?php _e('user account based with oAuth', 'tweetblender' ); ?> <input type="radio" value="direct" name="advanced_reroute_type" <?php checked('direct', $tb_o['advanced_reroute_type']); ?>/> <?php _e('IP based', 'tweetblender' ); ?>)<br/> 
     
    639628            <th class="th-full" colspan="2" scope="row"> 
    640629            <label for="advanced_show_limit_msg"> 
    641             <input type="checkbox" name="advanced_show_limit_msg" <?php checked('on', isset($tb_o['advanced_show_limit_msg'])); ?>/> 
     630            <input type="checkbox" name="advanced_show_limit_msg" <?php checked('on', $tb_o['advanced_show_limit_msg']); ?>/> 
    642631            <?php _e('Notify user when Twitter API connection limit is reached', 'tweetblender' ); ?>  
    643632            </label><br/> 
     
    650639            <th class="th-full" colspan="2" scope="row"> 
    651640            <label for="advanced_disable_cache"> 
    652             <input type="checkbox" name="advanced_disable_cache" <?php checked('on', isset($tb_o['advanced_disable_cache'])); ?>/> 
     641            <input type="checkbox" name="advanced_disable_cache" <?php checked('on', $tb_o['advanced_disable_cache']); ?>/> 
    653642            <?php _e('Disable data caching', 'tweetblender' ); ?>  
    654643            </label><br/> 
     
    685674            <th class="th-full" colspan="2" scope="row"> 
    686675            <label for="advanced_no_search_api"> 
    687             <input type="checkbox" name="advanced_no_search_api" <?php checked('on', isset($tb_o['advanced_no_search_api'])); ?>/> 
     676            <input type="checkbox" name="advanced_no_search_api" <?php checked('on', $tb_o['advanced_no_search_api']); ?>/> 
    688677            <?php _e('Do not use search API for screen names', 'tweetblender' ); ?>  
    689678            </label><br/> 
  • tweet-blender/trunk/js/main.js

    r405901 r406596  
    33 */ 
    44 
    5 var TB_version = '3.3.11',  // Plugin version  
     5var TB_version = '3.3.12',  // Plugin version  
    66TB_rateLimitData, 
    77TB_tmp, 
  • tweet-blender/trunk/lib/lib.php

    r405242 r406596  
    11<?php 
    22 
    3 // Version 3.3.10 
     3// Version 3.3.12 
    44 
    55// aliases for sources 
     
    289289 
    290290// if we don't have json class, get own PHP4 compatible library 
    291 if (!isset($wp_json) || !is_a($wp_json, 'Services_JSON') ) { 
    292     require_once( dirname(__FILE__) . '/JSON.php' ); 
     291if (!isset($wp_json) || !is_a($wp_json, 'Services_JSON')) { 
     292    if (!class_exists('Services_JSON')) { 
     293        require_once( dirname(__FILE__) . '/JSON.php' ); 
     294    } 
    293295    $wp_json = new Services_JSON(); 
    294296} 
  • tweet-blender/trunk/readme.txt

    r405901 r406596  
    44Requires at least: 2.8.0 
    55Tested up to: 3.2 
    6 Stable tag: 3.3.11 
     6Stable tag: 3.3.12 
    77Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5907095 
    88 
     
    185185== Changelog == 
    186186 
     187= 3.3.12 = 
     188* Bug fix: error during activation "Fatal error: Cannot redeclare class Services_JSON in /.../wp-content/plugins/tweet-blender/lib/JSON.php on line 116" (thanks to Peter O for reporting via WP Support forum) 
     189* Bug fix: checkbox state was not shown as checked after settings were saved in admin (thanks to @JDub82 for reporting via Twitter) 
     190 
    187191= 3.3.11 = 
    188192* Replaced non-GPL jQuery.lightbox plugin with jQuery.fancybox plugin to deal with new WP policy enforcement 
  • tweet-blender/trunk/tweet-blender.php

    r405901 r406596  
    44Plugin URI: http://www.tweetblender.com 
    55Description: Provides several Twitter widgets: show your own tweets, show tweets relevant to post's tags, show tweets for Twitter lists, show tweets for hashtags, show tweets for keyword searches, show favorite tweets. Multiple widgets on the same page are supported. Can combine sources and blend all of them into a single stream. 
    6 Version: 3.3.11 
     6Version: 3.3.12 
    77Author: Kirill Novitchenko 
    88Author URI: http://kirill-novitchenko.com 
Note: See TracChangeset for help on using the changeset viewer.