FEEDZY RSS Feeds Lite - Version 3.3.4

Version Description

  • 2019-02-08
Download this release

Release Info

Developer codeinwp
Plugin Icon 128x128 FEEDZY RSS Feeds Lite
Version 3.3.4
Comparing to
See all releases

Code changes from version 3.3.3 to 3.3.4

Files changed (12) hide show
  1. CHANGELOG.md +4 -0
  2. css/feedzy-rss-feeds.css +1 -1
  3. feedzy-rss-feed.php +1 -1
  4. includes/abstract/feedzy-rss-feeds-admin-abstract.php +20 -7
  5. includes/feedzy-rss-feeds.php +2 -2
  6. readme.md +5 -0
  7. readme.txt +5 -0
  8. themeisle-hash.json +1 -1
  9. vendor/autoload.php +1 -1
  10. vendor/autoload_52.php +1 -1
  11. vendor/composer/autoload_real.php +5 -5
  12. vendor/composer/autoload_real_52.php +3 -3
CHANGELOG.md CHANGED
@@ -1,4 +1,8 @@
1
 
 
 
 
 
2
  ### v3.3.3 - 2019-01-31
3
  **Changes:**
4
  * Customize error message when no items in the feed
1
 
2
+ ### v3.3.4 - 2019-02-08
3
+ **Changes:**
4
+ * Multifeed shows an error and no content if even one feed has an error
5
+
6
  ### v3.3.3 - 2019-01-31
7
  **Changes:**
8
  * Customize error message when no items in the feed
css/feedzy-rss-feeds.css CHANGED
@@ -2,7 +2,7 @@
2
  * feedzy-rss-feeds.css
3
  * Feedzy RSS Feed
4
  * Copyright: (c) 2016 Themeisle, themeisle.com
5
- * Version: 3.3.3
6
  * Plugin Name: FEEDZY RSS Feeds
7
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
8
  * Author: Themeisle
2
  * feedzy-rss-feeds.css
3
  * Feedzy RSS Feed
4
  * Copyright: (c) 2016 Themeisle, themeisle.com
5
+ * Version: 3.3.4
6
  * Plugin Name: FEEDZY RSS Feeds
7
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
8
  * Author: Themeisle
feedzy-rss-feed.php CHANGED
@@ -15,7 +15,7 @@
15
  * Plugin Name: Feedzy RSS Feeds Lite
16
  * Plugin URI: https://themeisle.com/plugins/feedzy-rss-feeds-lite/
17
  * Description: A small and lightweight RSS aggregator plugin. Fast and very easy to use, it allows you to aggregate multiple RSS feeds into your WordPress site through fully customizable shortcodes & widgets.
18
- * Version: 3.3.3
19
  * Author: Themeisle
20
  * Author URI: http://themeisle.com
21
  * License: GPL-2.0+
15
  * Plugin Name: Feedzy RSS Feeds Lite
16
  * Plugin URI: https://themeisle.com/plugins/feedzy-rss-feeds-lite/
17
  * Description: A small and lightweight RSS aggregator plugin. Fast and very easy to use, it allows you to aggregate multiple RSS feeds into your WordPress site through fully customizable shortcodes & widgets.
18
+ * Version: 3.3.4
19
  * Author: Themeisle
20
  * Author URI: http://themeisle.com
21
  * License: GPL-2.0+
includes/abstract/feedzy-rss-feeds-admin-abstract.php CHANGED
@@ -46,15 +46,28 @@ abstract class Feedzy_Rss_Feeds_Admin_Abstract {
46
  * @since 3.0.0
47
  * @access public
48
  *
49
- * @param object $error The error Object.
50
- * @param string $feed_url The feed URL.
 
51
  *
52
  * @return string
53
  */
54
- public function feedzy_default_error_notice( $error, $feed_url ) {
55
- error_log( 'Feedzy RSS Feeds - related feed: ' . print_r( $feed_url, true ) . ' - Error message: ' . $this->feedzy_array_obj_string( $error ) );
 
 
 
 
 
 
 
56
 
57
- return '<div id="message" class="error" data-error"' . esc_attr( $this->feedzy_array_obj_string( $error ) ) . '"><p>' . __( 'Sorry, this feed is currently unavailable or does not exist anymore.', 'feedzy-rss-feeds' ) . '</p></div>';
 
 
 
 
 
58
  }
59
 
60
  /**
@@ -620,11 +633,11 @@ abstract class Feedzy_Rss_Feeds_Admin_Abstract {
620
  }
621
  // Display the error message and quit (before showing the template for pro).
622
  if ( $feed->error() ) {
623
- return apply_filters( 'feedzy_default_error', $feed->error(), $feed_url );
624
  }
625
 
626
  $feed_items = apply_filters( 'feedzy_get_feed_array', array(), $sc, $feed, $feed_url, $sizes );
627
- $content = '<div class="feedzy-rss">';
628
  if ( $feed_title['use_title'] ) {
629
  $content .= '<div class="rss_header">';
630
  $content .= '<h2><a href="' . $feed->get_permalink() . '" class="rss_title" rel="noopener">' . html_entity_decode( $feed->get_title() ) . '</a> <span class="rss_description"> ' . $feed->get_description() . '</span></h2>';
46
  * @since 3.0.0
47
  * @access public
48
  *
49
+ * @param object $errors The error object.
50
+ * @param SimplePie $feed The SimplePie object.
51
+ * @param string $feed_url The feed URL.
52
  *
53
  * @return string
54
  */
55
+ public function feedzy_default_error_notice( $errors, $feed, $feed_url ) {
56
+ // reason not to show the error
57
+ // If a feed URL goes out of whack, its not the user who is viewing or the user who has used the shortcode.
58
+ // So let's not penalize the site owner/viewer because they can always refer to error log.
59
+ $show_error = false;
60
+ $error_msg = '';
61
+ foreach ( $errors as $i => $error ) {
62
+ $error_msg .= sprintf( "%s : %s\n", $feed->multifeed_url[ $i ], $error );
63
+ }
64
 
65
+ error_log( 'Feedzy RSS Feeds - related feed: ' . print_r( $feed_url, true ) . ' - Error message: ' . $error_msg );
66
+
67
+ if ( $show_error ) {
68
+ return '<div id="message" class="error" title="' . $error_msg . '"><p>' . __( 'Sorry, some part of this feed is currently unavailable or does not exist anymore.', 'feedzy-rss-feeds' ) . '</p></div>';
69
+ }
70
+ return '';
71
  }
72
 
73
  /**
633
  }
634
  // Display the error message and quit (before showing the template for pro).
635
  if ( $feed->error() ) {
636
+ $content .= apply_filters( 'feedzy_default_error', $feed->error(), $feed, $feed_url );
637
  }
638
 
639
  $feed_items = apply_filters( 'feedzy_get_feed_array', array(), $sc, $feed, $feed_url, $sizes );
640
+ $content .= '<div class="feedzy-rss">';
641
  if ( $feed_title['use_title'] ) {
642
  $content .= '<div class="rss_header">';
643
  $content .= '<h2><a href="' . $feed->get_permalink() . '" class="rss_title" rel="noopener">' . html_entity_decode( $feed->get_title() ) . '</a> <span class="rss_description"> ' . $feed->get_description() . '</span></h2>';
includes/feedzy-rss-feeds.php CHANGED
@@ -104,7 +104,7 @@ class Feedzy_Rss_Feeds {
104
  */
105
  public function init() {
106
  self::$plugin_name = 'feedzy-rss-feeds';
107
- self::$version = '3.3.3';
108
  self::$instance->load_dependencies();
109
  self::$instance->set_locale();
110
  self::$instance->define_admin_hooks();
@@ -201,7 +201,7 @@ class Feedzy_Rss_Feeds {
201
  self::$instance->loader->add_filter( 'mce_external_languages', $plugin_ui, 'feedzy_add_tinymce_lang', 10, 1 );
202
  self::$instance->loader->add_filter( 'plugin_row_meta', self::$instance->admin, 'feedzy_filter_plugin_row_meta', 10, 2 );
203
  self::$instance->loader->add_filter( 'feedzy_default_image', self::$instance->admin, 'feedzy_define_default_image' );
204
- self::$instance->loader->add_filter( 'feedzy_default_error', self::$instance->admin, 'feedzy_default_error_notice', 9, 2 );
205
  self::$instance->loader->add_filter( 'feedzy_item_attributes', self::$instance->admin, 'feedzy_add_item_padding', 10, 2 );
206
  self::$instance->loader->add_filter( 'feedzy_item_attributes', self::$instance->admin, 'feedzy_classes_item', 99, 5 );
207
  self::$instance->loader->add_filter( 'feedzy_register_options', self::$instance->admin, 'register_options' );
104
  */
105
  public function init() {
106
  self::$plugin_name = 'feedzy-rss-feeds';
107
+ self::$version = '3.3.4';
108
  self::$instance->load_dependencies();
109
  self::$instance->set_locale();
110
  self::$instance->define_admin_hooks();
201
  self::$instance->loader->add_filter( 'mce_external_languages', $plugin_ui, 'feedzy_add_tinymce_lang', 10, 1 );
202
  self::$instance->loader->add_filter( 'plugin_row_meta', self::$instance->admin, 'feedzy_filter_plugin_row_meta', 10, 2 );
203
  self::$instance->loader->add_filter( 'feedzy_default_image', self::$instance->admin, 'feedzy_define_default_image' );
204
+ self::$instance->loader->add_filter( 'feedzy_default_error', self::$instance->admin, 'feedzy_default_error_notice', 9, 3 );
205
  self::$instance->loader->add_filter( 'feedzy_item_attributes', self::$instance->admin, 'feedzy_add_item_padding', 10, 2 );
206
  self::$instance->loader->add_filter( 'feedzy_item_attributes', self::$instance->admin, 'feedzy_classes_item', 99, 5 );
207
  self::$instance->loader->add_filter( 'feedzy_register_options', self::$instance->admin, 'register_options' );
readme.md CHANGED
@@ -399,6 +399,11 @@ You have to check first if your feed is valid. Please test it here: https://vali
399
 
400
 
401
  ## Changelog ##
 
 
 
 
 
402
  ### 3.3.3 - 2019-01-31 ###
403
 
404
  * Customize error message when no items in the feed
399
 
400
 
401
  ## Changelog ##
402
+ ### 3.3.4 - 2019-02-08 ###
403
+
404
+ * Multifeed shows an error and no content if even one feed has an error
405
+
406
+
407
  ### 3.3.3 - 2019-01-31 ###
408
 
409
  * Customize error message when no items in the feed
readme.txt CHANGED
@@ -399,6 +399,11 @@ You have to check first if your feed is valid. Please test it here: https://vali
399
 
400
 
401
  == Changelog ==
 
 
 
 
 
402
  = 3.3.3 - 2019-01-31 =
403
 
404
  * Customize error message when no items in the feed
399
 
400
 
401
  == Changelog ==
402
+ = 3.3.4 - 2019-02-08 =
403
+
404
+ * Multifeed shows an error and no content if even one feed has an error
405
+
406
+
407
  = 3.3.3 - 2019-01-31 =
408
 
409
  * Customize error message when no items in the feed
themeisle-hash.json CHANGED
@@ -1 +1 @@
1
- {"feedzy-rss-feed.php":"e79e27c9ae3dc579f6892ed200b24552","index.php":"71c0755260138a4b7b2182c3c61179f6","uninstall.php":"cdb21f8648e005cbb9c73481d1750186"}
1
+ {"feedzy-rss-feed.php":"07192fc940de5774389de0486c08ed16","index.php":"71c0755260138a4b7b2182c3c61179f6","uninstall.php":"cdb21f8648e005cbb9c73481d1750186"}
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer' . '/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e::getLoader();
4
 
5
  require_once __DIR__ . '/composer' . '/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInitbde45538a41b67cc51327d27bede2611::getLoader();
vendor/autoload_52.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
- return ComposerAutoloaderInitade923528ab5d2a5f0facc43915b585b::getLoader();
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
+ return ComposerAutoloaderInitb8d0b31a200bf269b12bdfa099b771fc::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e
6
  {
7
  private static $loader;
8
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e', 'loadClassLoader'));
25
 
26
  $map = require __DIR__ . '/autoload_namespaces.php';
27
  foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInit7cbe24d5e9e3efbfd7d05e55bd59f69e
42
 
43
  $includeFiles = require __DIR__ . '/autoload_files.php';
44
  foreach ($includeFiles as $fileIdentifier => $file) {
45
- composerRequire7cbe24d5e9e3efbfd7d05e55bd59f69e($fileIdentifier, $file);
46
  }
47
 
48
  return $loader;
49
  }
50
  }
51
 
52
- function composerRequire7cbe24d5e9e3efbfd7d05e55bd59f69e($fileIdentifier, $file)
53
  {
54
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
55
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInitbde45538a41b67cc51327d27bede2611
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInitbde45538a41b67cc51327d27bede2611', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInitbde45538a41b67cc51327d27bede2611', 'loadClassLoader'));
25
 
26
  $map = require __DIR__ . '/autoload_namespaces.php';
27
  foreach ($map as $namespace => $path) {
42
 
43
  $includeFiles = require __DIR__ . '/autoload_files.php';
44
  foreach ($includeFiles as $fileIdentifier => $file) {
45
+ composerRequirebde45538a41b67cc51327d27bede2611($fileIdentifier, $file);
46
  }
47
 
48
  return $loader;
49
  }
50
  }
51
 
52
+ function composerRequirebde45538a41b67cc51327d27bede2611($fileIdentifier, $file)
53
  {
54
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
55
  require $file;
vendor/composer/autoload_real_52.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
- class ComposerAutoloaderInitade923528ab5d2a5f0facc43915b585b {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitade923528ab5d2a5f0facc43915b585b {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInitade923528ab5d2a5f0facc43915b585b', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInitade923528ab5d2a5f0facc43915b585b', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);
2
 
3
  // autoload_real_52.php generated by xrstf/composer-php52
4
 
5
+ class ComposerAutoloaderInitb8d0b31a200bf269b12bdfa099b771fc {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInitb8d0b31a200bf269b12bdfa099b771fc', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInitb8d0b31a200bf269b12bdfa099b771fc', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);