FEEDZY RSS Feeds Lite - Version 3.2.2

Version Description

  • 2017-10-13
Download this release

Release Info

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

Code changes from version 3.2.1 to 3.2.2

Files changed (12) hide show
  1. CHANGELOG.md +5 -0
  2. css/feedzy-rss-feeds.css +1 -10
  3. feedzy-rss-feed.php +1 -1
  4. includes/abstract/feedzy-rss-feeds-admin-abstract.php +0 -1
  5. includes/admin/feedzy-rss-feeds-admin.php +14 -3
  6. includes/feedzy-rss-feeds.php +1 -1
  7. readme.md +6 -0
  8. readme.txt +6 -0
  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,9 @@
1
 
 
 
 
 
 
2
  ### v3.2.1 - 2017-10-12
3
  **Changes:**
4
  * Adds global settings page.
1
 
2
+ ### v3.2.2 - 2017-10-13
3
+ **Changes:**
4
+ * Fix for assets enqueue, loading them where are needed only.
5
+ * Removes duplicates readme.md files.
6
+
7
  ### v3.2.1 - 2017-10-12
8
  **Changes:**
9
  * Adds global settings page.
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.2.1
6
  * Plugin Name: FEEDZY RSS Feeds
7
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
8
  * Author: Themeisle
@@ -513,15 +513,6 @@ input:checked + .feedzy-track:before {
513
  font-weight: bold;
514
  }
515
 
516
- /* More features - icon */
517
- .more-features-icon {
518
- width: 17px;
519
- height: 17px;
520
- margin-left: 4px;
521
- color: #ffca54;
522
- font-size: 17px;
523
- vertical-align: -3px;
524
- }
525
 
526
  .post-type-feedzy_categories .postbox-container div#submitdiv,
527
  .post-type-feedzy_categories #feedzy_category_feeds_rn {
2
  * feedzy-rss-feeds.css
3
  * Feedzy RSS Feed
4
  * Copyright: (c) 2016 Themeisle, themeisle.com
5
+ * Version: 3.2.2
6
  * Plugin Name: FEEDZY RSS Feeds
7
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
8
  * Author: Themeisle
513
  font-weight: bold;
514
  }
515
 
 
 
 
 
 
 
 
 
 
516
 
517
  .post-type-feedzy_categories .postbox-container div#submitdiv,
518
  .post-type-feedzy_categories #feedzy_category_feeds_rn {
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.2.1
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.2.2
19
  * Author: Themeisle
20
  * Author URI: http://themeisle.com
21
  * License: GPL-2.0+
includes/abstract/feedzy-rss-feeds-admin-abstract.php CHANGED
@@ -987,7 +987,6 @@ abstract class Feedzy_Rss_Feeds_Admin_Abstract {
987
  * @return mixed
988
  */
989
  public function load_layout( $layout_name ) {
990
- wp_enqueue_style( 'feedzy-upsell', FEEDZY_ABSURL . '/includes/layouts/css/upsell.css' );
991
  include( FEEDZY_ABSPATH . '/includes/layouts/' . $layout_name . '.php' );
992
  }
993
 
987
  * @return mixed
988
  */
989
  public function load_layout( $layout_name ) {
 
990
  include( FEEDZY_ABSPATH . '/includes/layouts/' . $layout_name . '.php' );
991
  }
992
 
includes/admin/feedzy-rss-feeds-admin.php CHANGED
@@ -89,9 +89,20 @@ class Feedzy_Rss_Feeds_Admin extends Feedzy_Rss_Feeds_Admin_Abstract {
89
  */
90
 
91
  wp_enqueue_style( $this->plugin_name, FEEDZY_ABSURL . 'css/feedzy-rss-feeds.css', array( 'feedzy-settings' ), $this->version, 'all' );
 
 
 
 
 
 
 
92
 
93
- wp_enqueue_style( 'feedzy-upsell', FEEDZY_ABSURL . '/includes/layouts/css/upsell.css' );
94
 
 
 
 
 
95
  wp_enqueue_style( 'feedzy-settings', FEEDZY_ABSURL . 'css/metabox-settings.css', array( 'feedzy-upsell' ) );
96
  }
97
 
@@ -315,7 +326,7 @@ class Feedzy_Rss_Feeds_Admin extends Feedzy_Rss_Feeds_Admin_Abstract {
315
  if ( strpos( $file, 'feedzy-rss-feed.php' ) !== false ) {
316
  $new_links = array(
317
  'doc' => '<a href="http://docs.themeisle.com/article/277-feedzy-rss-feeds-hooks" target="_blank" title="' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '">' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '</a>',
318
- 'more_features' => '<a href="' . FEEDZY_UPSELL_LINK . '" target="_blank" title="' . __( 'More Plugins', 'feedzy-rss-feeds' ) . '">' . __( 'More Features', 'feedzy-rss-feeds' ) . '<i class="dashicons dashicons-unlock more-features-icon"></i></a>',
319
  );
320
  $links = array_merge( $links, $new_links );
321
  }
@@ -335,7 +346,7 @@ class Feedzy_Rss_Feeds_Admin extends Feedzy_Rss_Feeds_Admin_Abstract {
335
  if ( ! class_exists( 'Feedzy_Rss_Feeds_Pro' ) ) {
336
  add_submenu_page(
337
  'feedzy-admin-menu', __( 'More Features', 'feedzy-rss-feeds' ), __( 'More Features', 'feedzy-rss-feeds' ) . '<span class="dashicons
338
- dashicons-star-filled more-features-icon"></span>', 'manage_options', 'feedzy-admin-menu-pro-upsell',
339
  array(
340
  $this,
341
  'render_upsell',
89
  */
90
 
91
  wp_enqueue_style( $this->plugin_name, FEEDZY_ABSURL . 'css/feedzy-rss-feeds.css', array( 'feedzy-settings' ), $this->version, 'all' );
92
+ $screen = get_current_screen();
93
+ if ( empty( $screen ) ) {
94
+ return;
95
+ }
96
+ if ( ! isset( $screen->base ) ) {
97
+ return;
98
+ }
99
 
100
+ $upsell_screens = array( 'feedzy-rss_page_feedzy-settings', 'feedzy-rss_page_feedzy-admin-menu-pro-upsell' );
101
 
102
+ if ( ! in_array( $screen->base, $upsell_screens ) && strpos( $screen->id, 'feedzy' ) === false ) {
103
+ return;
104
+ }
105
+ wp_enqueue_style( 'feedzy-upsell', FEEDZY_ABSURL . 'includes/layouts/css/upsell.css' );
106
  wp_enqueue_style( 'feedzy-settings', FEEDZY_ABSURL . 'css/metabox-settings.css', array( 'feedzy-upsell' ) );
107
  }
108
 
326
  if ( strpos( $file, 'feedzy-rss-feed.php' ) !== false ) {
327
  $new_links = array(
328
  'doc' => '<a href="http://docs.themeisle.com/article/277-feedzy-rss-feeds-hooks" target="_blank" title="' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '">' . __( 'Documentation and examples', 'feedzy-rss-feeds' ) . '</a>',
329
+ 'more_features' => '<a href="' . FEEDZY_UPSELL_LINK . '" target="_blank" title="' . __( 'More Plugins', 'feedzy-rss-feeds' ) . '">' . __( 'More Features', 'feedzy-rss-feeds' ) . '<i style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;" class="dashicons dashicons-unlock more-features-icon"></i></a>',
330
  );
331
  $links = array_merge( $links, $new_links );
332
  }
346
  if ( ! class_exists( 'Feedzy_Rss_Feeds_Pro' ) ) {
347
  add_submenu_page(
348
  'feedzy-admin-menu', __( 'More Features', 'feedzy-rss-feeds' ), __( 'More Features', 'feedzy-rss-feeds' ) . '<span class="dashicons
349
+ dashicons-star-filled more-features-icon" style="width: 17px; height: 17px; margin-left: 4px; color: #ffca54; font-size: 17px; vertical-align: -3px;"></span>', 'manage_options', 'feedzy-admin-menu-pro-upsell',
350
  array(
351
  $this,
352
  'render_upsell',
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.2.1';
108
  self::$instance->load_dependencies();
109
  self::$instance->set_locale();
110
  self::$instance->define_admin_hooks();
104
  */
105
  public function init() {
106
  self::$plugin_name = 'feedzy-rss-feeds';
107
+ self::$version = '3.2.2';
108
  self::$instance->load_dependencies();
109
  self::$instance->set_locale();
110
  self::$instance->define_admin_hooks();
readme.md CHANGED
@@ -221,6 +221,12 @@ You have to check first if your feed is valid. Please test it here: https://vali
221
 
222
 
223
  ## Changelog ##
 
 
 
 
 
 
224
  ### 3.2.1 - 2017-10-12 ###
225
 
226
  * Adds global settings page.
221
 
222
 
223
  ## Changelog ##
224
+ ### 3.2.2 - 2017-10-13 ###
225
+
226
+ * Fix for assets enqueue, loading them where are needed only.
227
+ * Removes duplicates readme.md files.
228
+
229
+
230
  ### 3.2.1 - 2017-10-12 ###
231
 
232
  * Adds global settings page.
readme.txt CHANGED
@@ -221,6 +221,12 @@ You have to check first if your feed is valid. Please test it here: https://vali
221
 
222
 
223
  == Changelog ==
 
 
 
 
 
 
224
  = 3.2.1 - 2017-10-12 =
225
 
226
  * Adds global settings page.
221
 
222
 
223
  == Changelog ==
224
+ = 3.2.2 - 2017-10-13 =
225
+
226
+ * Fix for assets enqueue, loading them where are needed only.
227
+ * Removes duplicates readme.md files.
228
+
229
+
230
  = 3.2.1 - 2017-10-12 =
231
 
232
  * Adds global settings page.
vendor/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer' . '/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0::getLoader();
4
 
5
  require_once __DIR__ . '/composer' . '/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInitd7adc3436aed03c6f496d3f6c9ad3566::getLoader();
vendor/autoload_52.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
- return ComposerAutoloaderInita65d57f992be8f52f9013180ac7c1d01::getLoader();
4
 
5
  require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
6
 
7
+ return ComposerAutoloaderInit976c0ed20429fad15f656336c7da8b5a::getLoader();
vendor/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0
6
  {
7
  private static $loader;
8
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0', 'loadClassLoader'));
25
 
26
  $map = require __DIR__ . '/autoload_namespaces.php';
27
  foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ class ComposerAutoloaderInit5f39049e2ab8c432062d5d8bff102dc0
42
 
43
  $includeFiles = require __DIR__ . '/autoload_files.php';
44
  foreach ($includeFiles as $fileIdentifier => $file) {
45
- composerRequire5f39049e2ab8c432062d5d8bff102dc0($fileIdentifier, $file);
46
  }
47
 
48
  return $loader;
49
  }
50
  }
51
 
52
- function composerRequire5f39049e2ab8c432062d5d8bff102dc0($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 ComposerAutoloaderInitd7adc3436aed03c6f496d3f6c9ad3566
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInitd7adc3436aed03c6f496d3f6c9ad3566', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInitd7adc3436aed03c6f496d3f6c9ad3566', '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
+ composerRequired7adc3436aed03c6f496d3f6c9ad3566($fileIdentifier, $file);
46
  }
47
 
48
  return $loader;
49
  }
50
  }
51
 
52
+ function composerRequired7adc3436aed03c6f496d3f6c9ad3566($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 ComposerAutoloaderInita65d57f992be8f52f9013180ac7c1d01 {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ class ComposerAutoloaderInita65d57f992be8f52f9013180ac7c1d01 {
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInita65d57f992be8f52f9013180ac7c1d01', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInita65d57f992be8f52f9013180ac7c1d01', '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 ComposerAutoloaderInit976c0ed20429fad15f656336c7da8b5a {
6
  private static $loader;
7
 
8
  public static function loadClassLoader($class) {
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit976c0ed20429fad15f656336c7da8b5a', 'loadClassLoader'), true /*, true */);
23
  self::$loader = $loader = new xrstf_Composer52_ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit976c0ed20429fad15f656336c7da8b5a', 'loadClassLoader'));
25
 
26
  $vendorDir = dirname(dirname(__FILE__));
27
  $baseDir = dirname($vendorDir);