diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-09-24 06:06:35 -0400 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-09-24 06:06:35 -0400 |
| commit | cf7684b611f3972835fa7278ce77f7dfd668cdd2 (patch) | |
| tree | f0e134898740c1dd6b77c84fb67416a58888fdea /modules/aggregator | |
| parent | 7f0feebe0b109f50a8cd0de2761d24c3fc013e10 (diff) | |
| download | brdo-cf7684b611f3972835fa7278ce77f7dfd668cdd2.tar.gz brdo-cf7684b611f3972835fa7278ce77f7dfd668cdd2.tar.bz2 | |
Reverting #1266348. We can't change APIs in a stable release.
Diffstat (limited to 'modules/aggregator')
| -rw-r--r-- | modules/aggregator/aggregator.pages.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc index 3ca084af0..53ecb3684 100644 --- a/modules/aggregator/aggregator.pages.inc +++ b/modules/aggregator/aggregator.pages.inc @@ -14,7 +14,7 @@ function aggregator_page_last() { drupal_add_feed('aggregator/rss', variable_get('site_name', 'Drupal') . ' ' . t('aggregator')); - $items = aggregator_load_feed_items('sum'); + $items = aggregator_feed_items_load('sum'); return _aggregator_page_list($items, arg(1)); } @@ -33,8 +33,8 @@ function aggregator_page_source($feed) { $feed_source = theme('aggregator_feed_source', array('feed' => $feed)); // It is safe to include the fid in the query because it's loaded from the - // database by aggregator_feed_load(). - $items = aggregator_load_feed_items('source', $feed); + // database by aggregator_feed_load. + $items = aggregator_feed_items_load('source', $feed); return _aggregator_page_list($items, arg(3), $feed_source); } @@ -67,8 +67,8 @@ function aggregator_page_category($category) { drupal_add_feed('aggregator/rss/' . $category['cid'], variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category['title']))); // It is safe to include the cid in the query because it's loaded from the - // database by aggregator_category_load(). - $items = aggregator_load_feed_items('category', $category); + // database by aggregator_category_load. + $items = aggregator_feed_items_load('category', $category); return _aggregator_page_list($items, arg(3)); } @@ -98,7 +98,7 @@ function aggregator_page_category_form($form, $form_state, $category) { * @return * An array of the feed items. */ -function aggregator_load_feed_items($type, $data = NULL) { +function aggregator_feed_items_load($type, $data = NULL) { $items = array(); $range_limit = 20; switch ($type) { |