Index: modules/aggregator/aggregator.processor.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.processor.inc,v
retrieving revision 1.3
diff -u -p -r1.3 aggregator.processor.inc
--- modules/aggregator/aggregator.processor.inc	26 Jan 2009 14:08:42 -0000	1.3
+++ modules/aggregator/aggregator.processor.inc	30 Mar 2009 23:32:18 -0000
@@ -72,6 +72,7 @@ function aggregator_form_aggregator_admi
     $info = module_invoke('aggregator', 'aggregator_process', 'info');
     $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
     $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
+    $period[0] = 'Never';
 
     // Only wrap into a collapsible fieldset if there is a basic configuration.
     if (isset($form['basic_conf'])) {
@@ -163,6 +164,10 @@ function aggregator_save_item($edit) {
  *   Object describing feed.
  */
 function aggregator_expire($feed) {
+  // Check if items should be retained indefinitely
+  $aggregator_clear = variable_get('aggregator_clear', 9676800);
+  if ($aggregator_clear == 0)
+    return;
   // Remove all items that are older than flush item timer.
   $age = REQUEST_TIME - variable_get('aggregator_clear', 9676800);
   $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array(':fid' => $feed->fid, ':timestamp' => $age))->fetchCol();