diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-05-17 08:54:08 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-05-17 08:54:08 +0000 |
| commit | 556f62f81a35dbef8b648fde1c23a71a3487a7b6 (patch) | |
| tree | 9cb3ea9b3b0bacf6f34fe61b717ba305bef71e28 /modules/aggregator | |
| parent | ad781731ef7c31a93de7b39ff07f80f32206c072 (diff) | |
| download | brdo-556f62f81a35dbef8b648fde1c23a71a3487a7b6.tar.gz brdo-556f62f81a35dbef8b648fde1c23a71a3487a7b6.tar.bz2 | |
- Patch #19646 by akahn, JamesAn: make it possible to suspend a feed.
Diffstat (limited to 'modules/aggregator')
| -rw-r--r-- | modules/aggregator/aggregator.admin.inc | 4 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index 8d26f74e1..bd218e6b6 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -27,7 +27,7 @@ function aggregator_view() { $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3')); $rows = array(); foreach ($result as $feed) { - $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never')), l(t('edit'), "admin/content/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/content/aggregator/remove/$feed->fid"), l(t('update items'), "admin/content/aggregator/update/$feed->fid")); + $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : t('never')), ($feed->checked && $feed->refresh ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never')), l(t('edit'), "admin/content/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/content/aggregator/remove/$feed->fid"), l(t('update items'), "admin/content/aggregator/update/$feed->fid")); } $output .= theme('table', $header, $rows); @@ -54,6 +54,8 @@ 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'); + $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#default_value' => isset($feed->title) ? $feed->title : '', diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index efd9ea2c9..b3e2deec6 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -279,7 +279,7 @@ 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', array(':time' => REQUEST_TIME)); + $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh > 0', array(':time' => REQUEST_TIME)); foreach ($result as $feed) { aggregator_refresh($feed); } |