Merge pull request #353 from Codeinwp/development

fix Gutenberg bug that limits max items per feed
Codeinwp · Jan 1, 2020 · f5bf1cb · f5bf1cb
2 parents 151f1c5 + 836ad0a
commit f5bf1cb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/css/feedzy-rss-feeds.css b/css/feedzy-rss-feeds.css
@@ -2,7 +2,7 @@
  * feedzy-rss-feeds.css
  * Feedzy RSS Feed
  * Copyright: (c) 2016 Themeisle, themeisle.com
- * Version: 3.3.14
+ * Version: 3.3.15
  * Plugin Name: FEEDZY RSS Feeds
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
  * Author: Themeisle

diff --git a/feedzy-rss-feed.php b/feedzy-rss-feed.php
@@ -15,7 +15,7 @@
  * Plugin Name:       Feedzy RSS Feeds Lite
  * Plugin URI:        https://themeisle.com/plugins/feedzy-rss-feeds-lite/
  * 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.
- * Version:           3.3.14
+ * Version:           3.3.15
  * Author:            Themeisle
  * Author URI:        http://themeisle.com
  * License:           GPL-2.0+

diff --git a/includes/abstract/feedzy-rss-feeds-admin-abstract.php b/includes/abstract/feedzy-rss-feeds-admin-abstract.php
@@ -711,9 +711,14 @@ public function sanitize_attr( $sc, $feed_url ) {
 		// phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison
 		if ( $sc['max'] == '0' ) {
 			$sc['max'] = '999';
-		} elseif ( empty( $sc['max'] ) || ! ctype_digit( $sc['max'] ) ) {
+		} elseif ( empty( $sc['max'] ) || ! is_numeric( $sc['max'] ) ) {
 			$sc['max'] = '5';
 		}
+
+		if ( empty( $sc['offset'] ) || ! is_numeric( $sc['offset'] ) ) {
+			$sc['offset'] = '0';
+		}
+
 		if ( empty( $sc['size'] ) || ! ctype_digit( $sc['size'] ) ) {
 			$sc['size'] = '150';
 		}
@@ -725,7 +730,7 @@ public function sanitize_attr( $sc, $feed_url ) {
 			$sc['keywords_ban'] = rtrim( $sc['keywords_ban'], ',' );
 			$sc['keywords_ban'] = array_map( 'trim', explode( ',', $sc['keywords_ban'] ) );
 		}
-		if ( ! empty( $sc['summarylength'] ) && ( ! ctype_digit( $sc['summarylength'] ) && ! is_numeric( $sc['summarylength'] ) ) ) {
+		if ( empty( $sc['summarylength'] ) || ! is_numeric( $sc['summarylength'] ) ) {
 			$sc['summarylength'] = '';
 		}
 		if ( empty( $sc['default'] ) ) {

diff --git a/includes/feedzy-rss-feeds.php b/includes/feedzy-rss-feeds.php
@@ -104,7 +104,7 @@ public static function instance() {
 	 */
 	public function init() {
 		self::$plugin_name = 'feedzy-rss-feeds';
-		self::$version = '3.3.14';
+		self::$version = '3.3.15';
 		self::$instance->load_dependencies();
 		self::$instance->set_locale();
 		self::$instance->define_admin_hooks();

diff --git a/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php b/includes/gutenberg/feedzy-rss-feeds-gutenberg-block.php
@@ -85,7 +85,7 @@ public function feedzy_register_block_type() {
 						'type' => 'string',
 					),
 					'max'            => array(
-						'type'    => 'string',
+						'type'    => 'number',
 						'default' => '5',
 					),
 					'offset'            => array(

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "feedzy-rss-feeds",
-  "version": "3.3.14",
+  "version": "3.3.15",
   "description": "Feedzy RSS Feeds - lite version",
   "repository": {
     "type": "git",