Merge pull request #31 from Codeinwp/development

Fixed issue with google news feeds

Author: selul

css/feedzy-rss-feeds.css

@@ -2,7 +2,7 @@
  * feedzy-rss-feeds.css
  * Feedzy RSS Feed
  * Copyright: (c) 2016 Themeisle, themeisle.com
- * Version: 3.0.4
+ * Version: 3.0.5
  * Plugin Name: FEEDZY RSS Feeds
  * Plugin URI: http://themeisle.com/plugins/feedzy-rss-feeds/
  * Author: Themeisle
@@ -346,9 +346,10 @@ i.mce-i-feedzy-icon {
 }
 
 /* Columns */
-.feedzy-rss .feedzy-rss-col-1{
+.feedzy-rss .feedzy-rss-col-1 {
 	width: 96%;
 }
+
 /* SCHIMBAT DIN ID in CLASA */
 .feedzy-rss .feedzy-rss-col-2,
 .feedzy-rss .feedzy-rss-col-3,

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:       This is a short description of what the plugin does. It's displayed in the WordPress admin area.
- * Version:           3.0.4
+ * Version:           3.0.5
  * Author:            Themeisle
  * Author URI:        http://themeisle.com
  * License:           GPL-2.0+

grunt/version.js

@@ -27,7 +27,7 @@ module.exports = {
 	},
 	class: {
 		options: {
-			prefix: '\\$this->version\.*\\s=\.*\\s\''
+			prefix: '\\.*version\.*\\s=\.*\\s\''
 		},
 		src: [
 			'includes/feedzy-rss-feeds.php',

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

@@ -698,7 +698,8 @@ public function feedzy_rss( $atts, $content = '' ) {
 		// TODO report error when is an error loading the feed
 		if ( is_wp_error( $feed ) ) { return '';
 		}
-
+		$feed->set_sanitize_class( 'SimplePie_Sanitize' );
+		$feed->sanitize = new SimplePie_Sanitize();
 		$feed -> enable_cache( true );
 		$feed -> enable_order_by_date( true );
 		$feed -> set_cache_class( 'WP_Feed_Cache' );

includes/admin/feedzy-wp-widget.php

@@ -233,10 +233,8 @@ public function widget( $args, $instance ) {
 			'keywords_title' => $instance['keywords_title'],
 		);
 		$feedzy_widget_shortcode_attributes = apply_filters( 'feedzy_widget_shortcode_attributes_filter', $feedzy_widget_shortcode_attributes, $args, $instance );
-		// Call the shortcode function
-		$plugin_admin = new Feedzy_Rss_Feeds_Admin( Feedzy_Rss_Feeds::get_plugin_name(), Feedzy_Rss_Feeds::get_version() );
 
-		echo $plugin_admin->feedzy_rss( $feedzy_widget_shortcode_attributes );
+		echo feedzy_rss( $feedzy_widget_shortcode_attributes );
 		echo $args['after_widget'];
 
 	}

includes/feedzy-rss-feeds.php

@@ -78,6 +78,20 @@ class Feedzy_Rss_Feeds {
 	 */
 	protected $admin;
 
+	/**
+	 * Init the main singleton instance class.
+	 *
+	 * @return Feedzy_Rss_Feeds Return the instance class
+	 */
+	public static function instance() {
+		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Feedzy_Rss_Feeds ) ) {
+			self::$instance = new Feedzy_Rss_Feeds;
+			self::$instance->init();
+		}
+
+		return self::$instance;
+	}
+
 	/**
 	 * Define the core functionality of the plugin.
 	 *
@@ -90,26 +104,13 @@ class Feedzy_Rss_Feeds {
 	 */
 	public function init() {
 		self::$plugin_name = 'feedzy-rss-feeds';
-		self::$version     = '3.0.3';
+		self::$version = '3.0.5';
 		self::$instance->load_dependencies();
 		self::$instance->set_locale();
 		self::$instance->define_admin_hooks();
 
 	}
 
-	/**
-	 * Init the main singleton instance class.
-	 *
-	 * @return Feedzy_Rss_Feeds Return the instance class
-	 */
-	public static function instance() {
-		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Feedzy_Rss_Feeds ) ) {
-			self::$instance = new Feedzy_Rss_Feeds;
-			self::$instance->init();
-		}
-
-		return self::$instance;
-	}
 	/**
 	 * Load the required dependencies for this plugin.
 	 *
@@ -127,12 +128,34 @@ public static function instance() {
 	 * @access   private
 	 */
 	private function load_dependencies() {
-
 		include_once FEEDZY_ABSPATH . '/includes/feedzy-rss-feeds-feed-tweaks.php';
-		self::$instance->loader = new Feedzy_Rss_Feeds_Loader();
+		self::$instance->loader   = new Feedzy_Rss_Feeds_Loader();
 		self::$instance->upgrader = new Feedzy_Rss_Feeds_Upgrader();
-		self::$instance->admin = new Feedzy_Rss_Feeds_Admin( self::$instance->get_plugin_name(), self::$instance->get_version() );
+		self::$instance->admin    = new Feedzy_Rss_Feeds_Admin( self::$instance->get_plugin_name(), self::$instance->get_version() );
+
+	}
+
+	/**
+	 * The name of the plugin used to uniquely identify it within the context of
+	 * WordPress and to define internationalization functionality.
+	 *
+	 * @since     3.0.0
+	 * @access    public
+	 * @return    string    The name of the plugin.
+	 */
+	public static function get_plugin_name() {
+		return self::$plugin_name;
+	}
 
+	/**
+	 * Retrieve the version number of the plugin.
+	 *
+	 * @since     3.0.0
+	 * @access    public
+	 * @return    string    The version number of the plugin.
+	 */
+	public static function get_version() {
+		return self::$version;
 	}
 
 	/**
@@ -181,29 +204,6 @@ private function define_admin_hooks() {
 		self::$instance->loader->add_action( 'widgets_init', $plugin_widget, 'registerWidget', 10 );
 	}
 
-	/**
-	 * The name of the plugin used to uniquely identify it within the context of
-	 * WordPress and to define internationalization functionality.
-	 *
-	 * @since     3.0.0
-	 * @access    public
-	 * @return    string    The name of the plugin.
-	 */
-	public static function get_plugin_name() {
-		return self::$plugin_name;
-	}
-
-	/**
-	 * Retrieve the version number of the plugin.
-	 *
-	 * @since     3.0.0
-	 * @access    public
-	 * @return    string    The version number of the plugin.
-	 */
-	public static function get_version() {
-		return self::$version;
-	}
-
 	/**
 	 * Run the loader to execute all of the hooks with WordPress.
 	 *

languages/feedzy-rss-feeds.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GPL-2.0+.
 msgid ""
 msgstr ""
-"Project-Id-Version: Feedzy RSS Feeds Lite 3.0.3\n"
+"Project-Id-Version: Feedzy RSS Feeds Lite 3.0.4\n"
 "Report-Msgid-Bugs-To: https://github.com/Codeinwp/feedzy-rss-feeds/issues\n"
-"POT-Creation-Date: 2017-01-11 11:14:17+00:00\n"
+"POT-Creation-Date: 2017-01-12 11:03:04+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -280,15 +280,15 @@ msgstr ""
 msgid "Style 2"
 msgstr ""
 
-#: includes/admin/feedzy-wp-widget.php:48
+#: includes/admin/feedzy-wp-widget.php:40
 msgid "Feedzy RSS Feeds"
 msgstr ""
 
-#: includes/admin/feedzy-wp-widget.php:92
+#: includes/admin/feedzy-wp-widget.php:83
 msgid "Widget Title"
 msgstr ""
 
-#: includes/admin/feedzy-wp-widget.php:96
+#: includes/admin/feedzy-wp-widget.php:87
 msgid "Intro text"
 msgstr ""
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "feedzy-rss-feeds",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "FEEDZY RSS Feeds is a small and lightweight RSS aggregator plugin",
   "repository": {
     "type": "git",

readme.txt

@@ -184,6 +184,9 @@ http://docs.themeisle.com/article/550-how-to-display-items-in-a-random-order
 
 == Changelog ==
 
+= 3.0.5 - 06/01/2017 =
+* Fixed issue with google news feed
+
 = 3.0.4 - 06/01/2017 =
 * Fixed thumb='auto' behaviour