Skip to content

Commit 31d97ea

Browse files
release: fixes
- Fixed compatibility issue with WordPress 6.7, preventing the New Import button from showing up
2 parents 11da8be + bd5c407 commit 31d97ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+53
-1544
lines changed

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/feedzy-rss-feed-import.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright: (c) 2016 Themeisle, themeisle.com
55
* Version: 1.6.10
66
* Plugin Name: FEEDZY RSS Feeds
7-
* Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
7+
* Plugin URI: https://themeisle.com/plugins/feedzy-rss-feeds/
88
* Author: Themeisle
99
*/
1010

css/feedzy-rss-feeds.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright: (c) 2016 Themeisle, themeisle.com
55
* Version: 4.4.15
66
* Plugin Name: FEEDZY RSS Feeds
7-
* Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
7+
* Plugin URI: https://themeisle.com/plugins/feedzy-rss-feeds/
88
* Author: Themeisle
99
*/
1010
.feedzy-rss > ul {

css/settings.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,16 @@
121121
margin-bottom: 20px;
122122
}
123123

124-
.feedzy-banner .tsdk-banner-urgency-text {
124+
.feedzy-banner:has(.tsdk-banner-cta) .tsdk-banner-urgency-text {
125125
padding: 5px;
126126
}
127127

128+
.feedzy-banner-dashboard {
129+
display: none;
130+
}
131+
128132
.feedzy-banner-dashboard:has(.tsdk-banner-cta) {
133+
display: block;
129134
margin: 20px 0;
130135

131136
/* Remove the properties added by .notice */

form/form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* A class definition that includes attributes and functions used across both the
66
* public-facing side of the site and the admin area.
77
*
8-
* @link http://themeisle.com
8+
* @link https://themeisle.com
99
* @since 3.0.0
1010
*
1111
* @package feedzy-rss-feeds

includes/abstract/feedzy-rss-feeds-admin-abstract.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The Abstract class with reusable functionality of the plugin.
44
*
5-
* @link http://themeisle.com
5+
* @link https://themeisle.com
66
* @since 3.0.0
77
*
88
* @package feedzy-rss-feeds
@@ -1594,18 +1594,21 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feed_url, $index, $i
15941594

15951595
$date_time = apply_filters( 'feedzy_feed_timestamp', $date_time, $feed_url, $item );
15961596
if ( $meta_args['date'] && ! empty( $meta_args['date_format'] ) ) {
1597-
$content_meta_values['date'] = apply_filters( 'feedzy_meta_date', __( 'on', 'feedzy-rss-feeds' ) . ' ' . date_i18n( $meta_args['date_format'], $date_time ) . ' ', $date_time, $feed_url, $item );
1597+
// translators: %s: the date of the imported content.
1598+
$content_meta_values['date'] = apply_filters( 'feedzy_meta_date', sprintf( __( 'on %s', 'feedzy-rss-feeds' ), date_i18n( $meta_args['date_format'], $date_time ) ) . ' ', $date_time, $feed_url, $item );
15981599
}
15991600

16001601
if ( $meta_args['time'] && ! empty( $meta_args['time_format'] ) ) {
1601-
$content_meta_values['time'] = apply_filters( 'feedzy_meta_time', __( 'at', 'feedzy-rss-feeds' ) . ' ' . date_i18n( $meta_args['time_format'], $date_time ) . ' ', $date_time, $feed_url, $item );
1602+
// translators: %s: the time of the imported content.
1603+
$content_meta_values['time'] = apply_filters( 'feedzy_meta_time', sprintf( __( 'at %s', 'feedzy-rss-feeds' ), date_i18n( $meta_args['time_format'], $date_time ) ) . ' ', $date_time, $feed_url, $item );
16021604
}
16031605

16041606
// categories.
16051607
if ( $meta_args['categories'] && has_filter( 'feedzy_retrieve_categories' ) ) {
16061608
$categories = apply_filters( 'feedzy_retrieve_categories', null, $item );
16071609
if ( ! empty( $categories ) ) {
1608-
$content_meta_values['categories'] = apply_filters( 'feedzy_meta_categories', __( 'in', 'feedzy-rss-feeds' ) . ' ' . $categories . ' ', $categories, $feed_url, $item );
1610+
// translators: %s: the category of the imported content.
1611+
$content_meta_values['categories'] = apply_filters( 'feedzy_meta_categories', sprintf( __( 'in %s', 'feedzy-rss-feeds' ), $categories ) . ' ', $categories, $feed_url, $item );
16091612
}
16101613
}
16111614

includes/admin/feedzy-rss-feeds-actions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The item content action chain process.
44
*
5-
* @link http://themeisle.com
5+
* @link https://themeisle.com
66
* @since 4.3
77
*
88
* @package feedzy-rss-feeds

includes/admin/feedzy-rss-feeds-admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The admin-specific functionality of the plugin.
44
*
5-
* @link http://themeisle.com
5+
* @link https://themeisle.com
66
* @since 3.0.0
77
*
88
* @package feedzy-rss-feeds

includes/admin/feedzy-rss-feeds-import.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The admin-specific functionality of the plugin.
44
*
5-
* @link http://themeisle.com/plugins/feedzy-rss-feed/
5+
* @link https://themeisle.com/plugins/feedzy-rss-feed/
66
* @since 1.0.0
77
*
88
* @package feedzy-rss-feeds
@@ -230,7 +230,7 @@ public function register_import_post_type() {
230230
'name' => __( 'Import Posts', 'feedzy-rss-feeds' ),
231231
'singular_name' => __( 'Import Post', 'feedzy-rss-feeds' ),
232232
'add_new' => __( 'New Import', 'feedzy-rss-feeds' ),
233-
'add_new_item' => false,
233+
'add_new_item' => __( 'New Import', 'feedzy-rss-feeds' ),
234234
'edit_item' => false,
235235
'new_item' => __( 'New Import Post', 'feedzy-rss-feeds' ),
236236
'view_item' => __( 'View Import', 'feedzy-rss-feeds' ),

includes/admin/feedzy-rss-feeds-options.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The Options main wrapper class.
44
*
5-
* @link http://themeisle.com
5+
* @link https://themeisle.com
66
* @since 3.0.3
77
*
88
* @package feedzy-rss-feeds

0 commit comments

Comments
 (0)