diff options
| -rw-r--r-- | CHANGELOG.txt | 4 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 12 | ||||
| -rw-r--r-- | modules/node/node.module | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 67f92eb3d..8844f401e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -43,8 +43,8 @@ Drupal x.x.x, xxxx-xx-xx (development version) * added configurable content types. * changed node rendering to work with structured arrays. - performance: - * improved session handling. - * omit sidebars when serving a '404 - Page not found'. + * improved session handling: reduces database overhead. + * omit sidebars when serving a '404 - Page not found': saves CPU cycles and bandwidth. - removed the archive module. - upgrade system: * created space for update branches. diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index e32f95c99..49edc354c 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -1030,6 +1030,8 @@ function aggregator_admin_overview() { * Menu callback; displays the most recent items gathered from any feed. */ function aggregator_page_last() { + drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'drupal') . ' ' . t('aggregator')); + return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1)); } @@ -1049,6 +1051,8 @@ function aggregator_page_source() { function aggregator_page_category() { $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2))); + drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'drupal') . ' ' . t('aggregator - @title', array('@title' => $category->title))); + return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3)); } @@ -1082,14 +1086,6 @@ function aggregator_page_list($sql, $header, $categorize) { } $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories')); $form['pager'] = array('#value' => theme('pager', NULL, 20, 0)); - // arg(1) is undefined if we are at the top aggregator URL - // is there a better way to do this? - if (!arg(1)) { - drupal_add_feed(url('aggregator/rss')); - } - elseif (arg(1) == 'categories' && arg(2) && !arg(3)) { - drupal_add_feed(url('aggregator/rss/'. arg(2))); - } return $form; } diff --git a/modules/node/node.module b/modules/node/node.module index 98505d38d..488cde59c 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -2257,7 +2257,7 @@ function node_page_default() { if (db_num_rows($result)) { $feed_url = url('rss.xml', NULL, NULL, TRUE); - drupal_add_feed($feed_url, t('RSS')); + drupal_add_feed($feed_url, variable_get('site_name', 'drupal') .' '. t('RSS')); $output = ''; while ($node = db_fetch_object($result)) { |