diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-05-28 09:30:58 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-05-28 09:30:58 +0000 |
| commit | 6e93e567e4f3dd1e1e4c34162f8fd13c3b8b2632 (patch) | |
| tree | 7b920028e407de3d9e8d191466f677f7bd0d2178 /modules/aggregator | |
| parent | 033f2f3fdc1a9fd0f2f2b76156e9ac54e1a0d2ed (diff) | |
| download | brdo-6e93e567e4f3dd1e1e4c34162f8fd13c3b8b2632.tar.gz brdo-6e93e567e4f3dd1e1e4c34162f8fd13c3b8b2632.tar.bz2 | |
- Patch #19646 by JamesAn: code clean up, consistently use define.
Diffstat (limited to 'modules/aggregator')
| -rw-r--r-- | modules/aggregator/aggregator.admin.inc | 2 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 10 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.processor.inc | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index 25b388593..9ffee9938 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -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'), diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 98fe9bc24..68e4a2380 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -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); } diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc index 592eee1ab..a2ff818c8 100644 --- a/modules/aggregator/aggregator.processor.inc +++ b/modules/aggregator/aggregator.processor.inc @@ -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() { |