WP RSS Aggregator - Version 4.6.7

Version Description

(2014-12-17) = * Enhanced: Some minor interface updates. * Enhanced: Added filters for use by the premium add-ons.

Download this release

Release Info

Developer Mekku
Plugin Icon 128x128 WP RSS Aggregator
Version 4.6.7
Comparing to
See all releases

Code changes from version 4.6.6 to 4.6.7

Files changed (6) hide show
  1. changelog.txt +4 -0
  2. css/admin-styles.css +2 -2
  3. includes/feed-display.php +16 -32
  4. includes/feed-importing.php +1 -1
  5. readme.txt +5 -1
  6. wp-rss-aggregator.php +3 -3
changelog.txt CHANGED
@@ -1,3 +1,7 @@
 
 
 
 
1
  4.6.6 (2014-12-06)
2
  Enhanced: Added output layouts for feed sources and feed items.
3
  Enhanced: Updated EDD updater class to version 1.5.
1
+ 4.6.7 (2014-12-17)
2
+ Enhanced: Some minor interface updates.
3
+ Enhanced: Added filters for use by the premium add-ons.
4
+
5
  4.6.6 (2014-12-06)
6
  Enhanced: Added output layouts for feed sources and feed items.
7
  Enhanced: Updated EDD updater class to version 1.5.
css/admin-styles.css CHANGED
@@ -59,8 +59,8 @@ body.post-type-wprss_feed #titlediv div.inside { display: none !important; }
59
 
60
  /* FORM TABLES */
61
  .wprss-form-table th {
62
- width: 120px;
63
- max-width: 120px;
64
  padding: 7px 10px 10px 0;
65
  }
66
  .wprss-form-table td {
59
 
60
  /* FORM TABLES */
61
  .wprss-form-table th {
62
+ width: 135px;
63
+ max-width: 135px;
64
  padding: 7px 10px 10px 0;
65
  }
66
  .wprss-form-table td {
includes/feed-display.php CHANGED
@@ -46,7 +46,7 @@
46
  * @return string The output
47
  * @since 4.6.6
48
  */
49
- function wprss_render_feed_item( $ID = NULL, $default = '' ) {
50
  $ID = ( $ID === NULL )? get_the_ID() : $ID;
51
  if ( get_post_type( $ID ) !== 'wprss_feed_item' || is_feed() ) return $default;
52
 
@@ -55,8 +55,7 @@
55
  $display_settings = wprss_get_display_settings( $general_settings );
56
  $excerpts_settings = get_option( 'wprss_settings_excerpts' );
57
  $thumbnails_settings = get_option( 'wprss_settings_thumbnails' );
58
-
59
- $args = wprss_get_shortcode_default_args( array() );
60
  $extra_options = apply_filters( 'wprss_template_extra_options', array(), $args);
61
 
62
  // Normalize the source_link option
@@ -170,7 +169,10 @@
170
  *
171
  * @since 3.0
172
  */
173
- function wprss_get_display_settings( $settings ) {
 
 
 
174
  // Parse the arguments together with their default values
175
  $args = wp_parse_args(
176
  $settings,
@@ -311,8 +313,10 @@
311
  * Default template for feed items display
312
  *
313
  * @since 3.0
 
 
314
  */
315
- function wprss_default_display_template( $display_settings, $args, $feed_items ) {
316
  global $wp_query;
317
  global $paged;
318
 
@@ -320,53 +324,34 @@
320
  $old_wp_query = $wp_query;
321
  $wp_query = $feed_items;
322
 
323
- // Prepare the options
324
- $general_settings = get_option( 'wprss_settings_general' );
325
- $excerpts_settings = get_option( 'wprss_settings_excerpts' );
326
- $thumbnails_settings = get_option( 'wprss_settings_thumbnails' );
327
-
328
- $extra_options = apply_filters( 'wprss_template_extra_options', array(), $args );
329
-
330
- // Normalize the source_link option
331
- $source_link = isset( $general_settings['source_link'] )? $general_settings['source_link'] : 0;
332
-
333
- // Declare each item in $args as its own variable
334
- extract( $args, EXTR_SKIP );
335
-
336
  // Prepare the output
337
  $output = '';
338
 
339
-
340
  // Check if our current query returned any feed items
341
  if ( $feed_items->have_posts() ) {
342
-
343
  // PRINT LINKS BEFORE LIST OF FEED ITEMS
344
- $output .= "$links_before";
345
 
346
  // FOR EACH ITEM
347
  while ( $feed_items->have_posts() ) {
348
  // Get the item
349
  $feed_items->the_post();
350
  // Add the output
351
- $output .= wprss_render_feed_item();
352
  }
353
 
354
  // OUTPUT LINKS AFTER LIST OF FEED ITEMS
355
- $output .= "$links_after";
356
 
357
  // Add pagination if needed
358
  if ( !isset( $args['pagination'] ) || !in_array( $args['pagination'], array('off','false','0',0) ) ) {
359
  $output = apply_filters( 'wprss_pagination', $output );
360
  }
361
 
362
- // Filter the final output
363
- $output = apply_filters( 'feed_output', $output );
364
-
365
- // Print the output
366
- echo $output;
367
-
368
  } else {
369
- // Not items found message
370
  echo apply_filters( 'no_feed_items_found', __( 'No feed items found.', WPRSS_TEXT_DOMAIN ) );
371
  }
372
 
@@ -453,7 +438,6 @@
453
  */
454
  function wprss_display_feed_items( $args = array() ) {
455
  $settings = get_option( 'wprss_settings_general' );
456
- $display_settings = wprss_get_display_settings( $settings );
457
  $args = wprss_get_shortcode_default_args( $args );
458
 
459
  $args = apply_filters( 'wprss_shortcode_args', $args );
@@ -483,7 +467,7 @@
483
 
484
  $feed_items = wprss_get_feed_items_query( $query_args );
485
 
486
- do_action( 'wprss_display_template', $display_settings, $args, $feed_items );
487
  }
488
 
489
 
46
  * @return string The output
47
  * @since 4.6.6
48
  */
49
+ function wprss_render_feed_item( $ID = NULL, $default = '', $args = array() ) {
50
  $ID = ( $ID === NULL )? get_the_ID() : $ID;
51
  if ( get_post_type( $ID ) !== 'wprss_feed_item' || is_feed() ) return $default;
52
 
55
  $display_settings = wprss_get_display_settings( $general_settings );
56
  $excerpts_settings = get_option( 'wprss_settings_excerpts' );
57
  $thumbnails_settings = get_option( 'wprss_settings_thumbnails' );
58
+
 
59
  $extra_options = apply_filters( 'wprss_template_extra_options', array(), $args);
60
 
61
  // Normalize the source_link option
169
  *
170
  * @since 3.0
171
  */
172
+ function wprss_get_display_settings( $settings = NULL ) {
173
+ if ( $settings === NULL ) {
174
+ $settings = get_option( 'wprss_settings_general' );
175
+ }
176
  // Parse the arguments together with their default values
177
  $args = wp_parse_args(
178
  $settings,
313
  * Default template for feed items display
314
  *
315
  * @since 3.0
316
+ * @param $args array The shortcode arguments
317
+ * @param $feed_items WP_Query The feed items to display
318
  */
319
+ function wprss_default_display_template( $args, $feed_items ) {
320
  global $wp_query;
321
  global $paged;
322
 
324
  $old_wp_query = $wp_query;
325
  $wp_query = $feed_items;
326
 
 
 
 
 
 
 
 
 
 
 
 
 
 
327
  // Prepare the output
328
  $output = '';
329
 
 
330
  // Check if our current query returned any feed items
331
  if ( $feed_items->have_posts() ) {
 
332
  // PRINT LINKS BEFORE LIST OF FEED ITEMS
333
+ $output .= $args['links_before'];
334
 
335
  // FOR EACH ITEM
336
  while ( $feed_items->have_posts() ) {
337
  // Get the item
338
  $feed_items->the_post();
339
  // Add the output
340
+ $output .= wprss_render_feed_item( NULL, '', $args );
341
  }
342
 
343
  // OUTPUT LINKS AFTER LIST OF FEED ITEMS
344
+ $output .= $args['links_after'];
345
 
346
  // Add pagination if needed
347
  if ( !isset( $args['pagination'] ) || !in_array( $args['pagination'], array('off','false','0',0) ) ) {
348
  $output = apply_filters( 'wprss_pagination', $output );
349
  }
350
 
351
+ // Filter the final output, and print it
352
+ echo apply_filters( 'feed_output', $output );
 
 
 
 
353
  } else {
354
+ // No items found message
355
  echo apply_filters( 'no_feed_items_found', __( 'No feed items found.', WPRSS_TEXT_DOMAIN ) );
356
  }
357
 
438
  */
439
  function wprss_display_feed_items( $args = array() ) {
440
  $settings = get_option( 'wprss_settings_general' );
 
441
  $args = wprss_get_shortcode_default_args( $args );
442
 
443
  $args = apply_filters( 'wprss_shortcode_args', $args );
467
 
468
  $feed_items = wprss_get_feed_items_query( $query_args );
469
 
470
+ do_action( 'wprss_display_template', $args, $feed_items );
471
  }
472
 
473
 
includes/feed-importing.php CHANGED
@@ -521,7 +521,7 @@
521
  }
522
  // If the item is TRUE, then a hook function in the filter inserted the item.
523
  // increment the inserted counter
524
- elseif ( ( is_bool($item) && $item === TRUE ) || $still_update_count === TRUE ) {
525
  $items_inserted++;
526
  }
527
  }
521
  }
522
  // If the item is TRUE, then a hook function in the filter inserted the item.
523
  // increment the inserted counter
524
+ elseif ( ( is_bool($item) && $item === TRUE ) || ( $still_update_count === TRUE && $item !== FALSE ) ) {
525
  $items_inserted++;
526
  }
527
  }
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: jeangalea, Mekku, xedin.unknown, markzahra
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9GP6BL4BLXBJ
4
  Plugin URI: http://www.wprssaggregator.com
5
- Tags: rss, feeds, aggregation, rss to post, autoblog aggregator, rss import, feed aggregator, rss aggregator, multiple rss feeds, multi rss feeds, rss multi importer, feed import, feed import, multiple feed import, feed aggregation, rss feader, feed reader, feed to post, multiple feeds, multi feed importer, multi feed import, multi import, autoblogging, autoblogger
6
  Requires at least: 3.3
7
  Tested up to: 4.0
8
  Stable tag: 4.6.6
@@ -167,6 +167,10 @@ The full documentation section can be found on the [WP RSS Aggregator website](w
167
 
168
  == Changelog ==
169
 
 
 
 
 
170
  = 4.6.6 (2014-12-06) =
171
  * Enhanced: Added output layouts for feed sources and feed items.
172
  * Enhanced: Updated EDD updater class to version 1.5.
2
  Contributors: jeangalea, Mekku, xedin.unknown, markzahra
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9GP6BL4BLXBJ
4
  Plugin URI: http://www.wprssaggregator.com
5
+ Tags: rss, feeds, aggregation, rss to post, autoblog aggregator, rss import, feed aggregator, rss aggregator, multiple rss feeds, multi rss feeds, rss multi importer, feed import, feed import, multiple feed import, feed aggregation, rss feader, feed reader, feed to post, multiple feeds, multi feed importer, multi feed import, multi import, autoblogging, autoblogger, rss feeder, rss post importer, autoblog aggregator, autoblog, autopost, content curation, feedwordpress, wp rss multi import, hungryfeed, wp-o-matic, rss feed, rss feed to post, rss retriever, syndication
6
  Requires at least: 3.3
7
  Tested up to: 4.0
8
  Stable tag: 4.6.6
167
 
168
  == Changelog ==
169
 
170
+ = 4.6.7 (2014-12-17) =
171
+ * Enhanced: Some minor interface updates.
172
+ * Enhanced: Added filters for use by the premium add-ons.
173
+
174
  = 4.6.6 (2014-12-06) =
175
  * Enhanced: Added output layouts for feed sources and feed items.
176
  * Enhanced: Updated EDD updater class to version 1.5.
wp-rss-aggregator.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: WP RSS Aggregator
4
  Plugin URI: http://www.wprssaggregator.com
5
  Description: Imports and aggregates multiple RSS Feeds using SimplePie
6
- Version: 4.6.6
7
  Author: Jean Galea
8
  Author URI: http://www.wprssaggregator.com
9
  License: GPLv2
@@ -29,7 +29,7 @@
29
 
30
  /**
31
  * @package WPRSSAggregator
32
- * @version 4.6.6
33
  * @since 1.0
34
  * @author Jean Galea <info@wprssaggregator.com>
35
  * @copyright Copyright (c) 2012-2014, Jean Galea
@@ -43,7 +43,7 @@
43
 
44
  // Set the version number of the plugin.
45
  if( !defined( 'WPRSS_VERSION' ) )
46
- define( 'WPRSS_VERSION', '4.6.6', true );
47
 
48
  // Set the database version number of the plugin.
49
  if( !defined( 'WPRSS_DB_VERSION' ) )
3
  Plugin Name: WP RSS Aggregator
4
  Plugin URI: http://www.wprssaggregator.com
5
  Description: Imports and aggregates multiple RSS Feeds using SimplePie
6
+ Version: 4.6.7
7
  Author: Jean Galea
8
  Author URI: http://www.wprssaggregator.com
9
  License: GPLv2
29
 
30
  /**
31
  * @package WPRSSAggregator
32
+ * @version 4.6.7
33
  * @since 1.0
34
  * @author Jean Galea <info@wprssaggregator.com>
35
  * @copyright Copyright (c) 2012-2014, Jean Galea
43
 
44
  // Set the version number of the plugin.
45
  if( !defined( 'WPRSS_VERSION' ) )
46
+ define( 'WPRSS_VERSION', '4.6.7', true );
47
 
48
  // Set the database version number of the plugin.
49
  if( !defined( 'WPRSS_DB_VERSION' ) )