Merge pull request #50 from Codeinwp/fixes

Release 3.1.2
Codeinwp · May 25, 2017 · 5bf4692 · 5bf4692
2 parents b3b6faf + 8be8976
commit 5bf4692
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 156 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.1.1
+ * Version: 3.1.2
  * 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:       This is a short description of what the plugin does. It's displayed in the WordPress admin area.
- * Version:           3.1.1
+ * Version:           3.1.2
  * 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
@@ -308,6 +308,7 @@ public function fetch_feed( $feedURL ) {
 		}
 		// Load SimplePie Instance
 		$feed = fetch_feed( $feedURL );
+
 		// Report error when is an error loading the feed
 		if ( is_wp_error( $feed ) ) {
 			// Fallback for different edge cases.
@@ -321,39 +322,6 @@ public function fetch_feed( $feedURL ) {
 				return __( 'An error occured for when trying to retrieve feeds! Check the URL\'s provided as feed sources.', 'feedzy-rss-feeds' );
 			}
 		}
-		$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' );
-		$feed->set_file_class( 'WP_SimplePie_File' );
-		$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 7200, $feedURL ) );
-		do_action_ref_array( 'wp_feed_options', array( $feed, $feedURL ) );
-		$feed->strip_comments( true );
-		$feed->strip_htmltags( array(
-			'base',
-			'blink',
-			'body',
-			'doctype',
-			'embed',
-			'font',
-			'form',
-			'frame',
-			'frameset',
-			'html',
-			'iframe',
-			'input',
-			'marquee',
-			'meta',
-			'noscript',
-			'object',
-			'param',
-			'script',
-			'style',
-		) );
-		$feed->init();
-		$feed->handle_content_type();
-
 		return $feed;
 	}
 
@@ -612,9 +580,9 @@ private function get_feed_item_filter( $sc, $sizes, $item, $feedURL ) {
 				}
 				if ( $authorName ) {
 					$domain      = parse_url( $newLink );
-					$authorURL   = 'http://' . $domain['host'];
+					$authorURL   = '//' . $domain['host'];
 					$authorURL   = apply_filters( 'feedzy_author_url', $authorURL, $authorName, $feedURL );
-					$contentMeta .= __( 'by', 'feedzy-rss-feeds' ) . ' <a href="http://' . $authorURL . '" target="' . $sc['target'] . '" title="' . $domain['host'] . '" >' . $authorName . '</a> ';
+					$contentMeta .= __( 'by', 'feedzy-rss-feeds' ) . ' <a href="' . $authorURL . '" target="' . $sc['target'] . '" title="' . $domain['host'] . '" >' . $authorName . '</a> ';
 				}
 			}
 			if ( $metaArgs['date'] ) {

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.1.1';
+		self::$version = '3.1.2';
 		self::$instance->load_dependencies();
 		self::$instance->set_locale();
 		self::$instance->define_admin_hooks();