Skip to content

Commit

Permalink
Ver bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
radgeek committed Jul 13, 2021
1 parent d707e28 commit 864923e
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 17 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
9 changes: 5 additions & 4 deletions feedwordpress.php
Expand Up @@ -3,15 +3,15 @@
Plugin Name: FeedWordPress
Plugin URI: http://feedwordpress.radgeek.com/
Description: simple and flexible Atom/RSS syndication for WordPress
Version: 2021.0118
Version: 2021.0713
Author: C. Johnson
Author URI: https://feedwordpress.radgeek.com/contact/
License: GPL
*/

/**
* @package FeedWordPress
* @version 2020.0818
* @version 2021.0713
*/

# This plugin uses code derived from:
Expand All @@ -30,15 +30,16 @@
## CONSTANTS & DEFAULTS ############################################################
####################################################################################

define ('FEEDWORDPRESS_VERSION', '2020.0818');
define ('FEEDWORDPRESS_VERSION', '2021.0713');
define ('FEEDWORDPRESS_AUTHOR_CONTACT', 'http://feedwordpress.radgeek.com/contact');

if (!defined('FEEDWORDPRESS_BLEG')) :
define ('FEEDWORDPRESS_BLEG', true);
endif;

define('FEEDWORDPRESS_BLEG_BTC_pre_2020', '15EsQ9QMZtLytsaVYZUaUCmrkSMaxZBTso');
define('FEEDWORDPRESS_BLEG_BTC', '1NB1ebYVb68Har4WijmE8gKnZ47NptCqtB'); // 2020.0201
define('FEEDWORDPRESS_BLEG_BTC_2020', '1NB1ebYVb68Har4WijmE8gKnZ47NptCqtB'); // 2020.0201
define('FEEDWORDPRESS_BLEG_BTC', '1HCDdeGcR66EPxkPT2rbdTd1ezh27pmjPR'); // 2021.0713

define('FEEDWORDPRESS_BLEG_PAYPAL', '22PAJZZCK5Z3W');

Expand Down
14 changes: 3 additions & 11 deletions feedwordpresssyndicationpage.class.php
Expand Up @@ -718,22 +718,13 @@ function bleg_box ($page, $box = NULL) {

<div id="flattr-paypal">

<div style="display: inline-block; vertical-align: middle; ">
<a class="FlattrButton" style="display:none;" href="http://feedwordpress.radgeek.com/"></a>
<noscript>
<a href="https://flattr.com/thing/1380856/FeedWordPress" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
</noscript>
<div>via Flattr</div>

</div> <!-- style="display: inline-block" -->

<div class="hovered-component" style="display: inline-block; vertical-align: bottom">
<a href="bitcoin:<?php print esc_attr(FEEDWORDPRESS_BLEG_BTC); ?>"><img src="<?php print esc_url( plugins_url('/'.FeedWordPress::path('btc-qr-64px.png') ) ); ?>" alt="Donate" /></a>
<a href="bitcoin:<?php print esc_attr(FEEDWORDPRESS_BLEG_BTC); ?>"><img src="<?php print esc_url( plugins_url('/'.FeedWordPress::path('assets/images/btc-qr-128px.png') ) ); ?>" alt="Donate" /></a>
<div><a href="bitcoin:<?php print esc_attr(FEEDWORDPRESS_BLEG_BTC); ?>">via bitcoin<span class="hover-on pop-over" style="background-color: #ddffdd; padding: 5px; color: black; border-radius: 5px;">bitcoin:<?php print esc_html(FEEDWORDPRESS_BLEG_BTC); ?></span></a></div>
</div>

<div style="display: inline-block; vertical-align: bottom">
<input type="image" name="submit" src="<?php print esc_url(plugins_url('/' . FeedWordPress::path('paypal-donation-64px.png' ) ) ); ?>" alt="Donate through PayPal" />
<input type="image" name="submit" src="<?php print esc_url(plugins_url('/' . FeedWordPress::path('assets/images/paypal-donation-64px.png' ) ) ); ?>" style="width: 128px; height: 128px;" alt="Donate via PayPal" />
<input type="hidden" name="business" value="<?php print esc_attr(FEEDWORDPRESS_BLEG_PAYPAL); ?>" />
<input type="hidden" name="cmd" value="_xclick" />
<input type="hidden" name="item_name" value="FeedWordPress donation" />
Expand Down Expand Up @@ -1138,6 +1129,7 @@ function fwp_syndication_manage_page_update_box ($object = NULL, $box = NULL) {
or (is_numeric($bleg_box_hidden) and $bleg_box_hidden < time())
));

$bleg_box_ready = apply_filters( 'feedwordpress_bleg_box_ready', $bleg_box_ready );
if (isset($_REQUEST['paid']) and $_REQUEST['paid']) :
$object->bleg_thanks($subject, $box);
elseif ($bleg_box_ready) :
Expand Down
19 changes: 17 additions & 2 deletions readme.txt
Expand Up @@ -3,8 +3,8 @@ Contributors: C. Johnson
Donate link: http://feedwordpress.radgeek.com/donate/
Tags: syndication, aggregation, feed, atom, rss
Requires at least: 4.5
Tested up to: 5.5
Stable tag: 2020.0818
Tested up to: 5.7.2
Stable tag: 2021.0713
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -65,6 +65,21 @@ FeedWordPress has many options which can be accessed through the WordPress Dashb

== Changelog ==

= 2021.0713 =

* WORDPRESS 5.6, 5.7.x COMPATIBILITY FIXES. This release introduces fixes to annoying or worse warnings resulting from
the deprecation of WordPress's built-in WP_Feed_Cache class. This should resolve the problem if you are encountering
annoying, worrying, or breaking problems related to the PHP warnings: "Deprecated: class-wp-feed-cache.php is
<strong>deprecated</strong> since version 5.6.0", and/or "Message: ./cache is not writable. Make sure you've set the
correct relative or absolute path, and that the location is server-writable."

* Fixes PHP warning for "count(): Parameter must be an array or an object that implements Countable in
.../wp-content/plugins/feedwordpress/feedwordpress.php on line 1566"

* Miscellaneous fixes for other missing variable and global warnings.

* Code cleanup and reorganization to allow better modularization of error messages, warning dialogs, and extended text.

= 2020.0818 =

* WORDPRESS 5.5 COMPATIBILITY FIXES, RESOLVES WARNING NOTICES OR WP-ADMIN LOCKOUT. WordPress 5.5 incorporated a newer release of SimplePie, version 1.5.5, which is pretty rad, but FeedWordPress classes that relied on SimplePie 1.3.1's method signatures would then produce PHP warning notices. That should be pretty innocuous, but depending on web server configurations, some users could get locked out of their own wp-admin interface by the display of error notices in the browser at inopportune times. In any case, I have added code to switch between backward-compatible modules for SimplePie 1.3.1 or updated modules compatible with SimplePie 1.5.5, based on the version available in your WordPress installation; so these notices and their untoward effects should be eliminated.
Expand Down

0 comments on commit 864923e

Please sign in to comment.