Index: modules/aggregator/aggregator.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v
retrieving revision 1.30
diff -u -p -r1.30 aggregator.admin.inc
--- modules/aggregator/aggregator.admin.inc	25 May 2009 18:22:30 -0000	1.30
+++ modules/aggregator/aggregator.admin.inc	27 May 2009 20:50:38 -0000
@@ -54,7 +54,7 @@ function aggregator_view() {
  */
 function aggregator_form_feed(&$form_state, stdClass $feed = NULL) {
   $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
-  $period[0] = t('Never');
+  $period[AGGREGATOR_CLEAR_NEVER] = t('Never');
 
   $form['title'] = array('#type' => 'textfield',
     '#title' => t('Title'),
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.411
diff -u -p -r1.411 aggregator.module
--- modules/aggregator/aggregator.module	27 May 2009 18:33:54 -0000	1.411
+++ modules/aggregator/aggregator.module	27 May 2009 20:50:38 -0000
@@ -7,6 +7,11 @@
  */
 
 /**
+ * Denotes that a feed's items should never expire.
+ */
+define('AGGREGATOR_CLEAR_NEVER', 0);
+
+/**
  * Implement hook_help().
  */
 function aggregator_help($path, $arg) {
@@ -286,7 +291,10 @@ function aggregator_perm() {
  * Checks news feeds for updates once their refresh interval has elapsed.
  */
 function aggregator_cron() {
-  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh > 0', array(':time' => REQUEST_TIME));
+  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh != :never', array(
+    ':time' => REQUEST_TIME,
+    ':never' => AGGREGATOR_CLEAR_NEVER
+  ));
   foreach ($result as $feed) {
     aggregator_refresh($feed);
   }
Index: modules/aggregator/aggregator.processor.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.processor.inc,v
retrieving revision 1.7
diff -u -p -r1.7 aggregator.processor.inc
--- modules/aggregator/aggregator.processor.inc	27 May 2009 18:33:54 -0000	1.7
+++ modules/aggregator/aggregator.processor.inc	27 May 2009 20:50:38 -0000
@@ -7,11 +7,6 @@
  */
 
 /**
- * Denotes that a feed's items should never expire.
- */
-define('AGGREGATOR_CLEAR_NEVER', 0);
-
-/**
  * Implement hook_aggregator_process_info().
  */
 function aggregator_aggregator_process_info() {