? referential-integrity.patch Index: modules/aggregator/aggregator.install =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v retrieving revision 1.8 diff -u -p -r1.8 aggregator.install --- modules/aggregator/aggregator.install 26 Sep 2006 14:19:00 -0000 1.8 +++ modules/aggregator/aggregator.install 20 Jan 2007 01:57:41 -0000 @@ -15,19 +15,7 @@ function aggregator_install() { block tinyint NOT NULL default '0', PRIMARY KEY (cid), UNIQUE KEY title (title) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); - - db_query("CREATE TABLE {aggregator_category_feed} ( - fid int NOT NULL default '0', - cid int NOT NULL default '0', - PRIMARY KEY (fid,cid) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); - - db_query("CREATE TABLE {aggregator_category_item} ( - iid int NOT NULL default '0', - cid int NOT NULL default '0', - PRIMARY KEY (iid,cid) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + ) /*!40100 DEFAULT CHARACTER SET UTF8 */"); db_query("CREATE TABLE {aggregator_feed} ( fid int NOT NULL auto_increment, @@ -44,9 +32,9 @@ function aggregator_install() { PRIMARY KEY (fid), UNIQUE KEY link (url), UNIQUE KEY title (title) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + ) /*!40100 DEFAULT CHARACTER SET UTF8 */"); - db_query("CREATE TABLE {aggregator_item} ( + db_query("CREATE TABLE {aggregator_item} ( iid int NOT NULL auto_increment, fid int NOT NULL default '0', title varchar(255) NOT NULL default '', @@ -56,8 +44,35 @@ function aggregator_install() { timestamp int default NULL, guid varchar(255), PRIMARY KEY (iid), - KEY fid (fid) - ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); + KEY fid (fid), + FOREIGN KEY (fid) + REFERENCES {aggregator_feed} (fid) + ON UPDATE CASCADE ON DELETE CASCADE + ) /*!40100 DEFAULT CHARACTER SET UTF8 */"); + + db_query("CREATE TABLE {aggregator_category_feed} ( + fid int NOT NULL default '0', + cid int NOT NULL default '0', + PRIMARY KEY (fid,cid), + FOREIGN KEY (fid) + REFERENCES {aggregator_feed} (fid) + ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (cid) + REFERENCES {aggregator_category} (cid) + ON UPDATE CASCADE ON DELETE CASCADE + ) /*!40100 DEFAULT CHARACTER SET UTF8 */"); + + db_query("CREATE TABLE {aggregator_category_item} ( + iid int NOT NULL default '0', + cid int NOT NULL default '0', + PRIMARY KEY (iid,cid), + FOREIGN KEY (iid) + REFERENCES {aggregator_item} (iid) + ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (cid) + REFERENCES {aggregator_category} (cid) + ON UPDATE CASCADE ON DELETE CASCADE + ) /*!40100 DEFAULT CHARACTER SET UTF8 */"); break; case 'pgsql': @@ -74,12 +89,24 @@ function aggregator_install() { fid int NOT NULL default '0', cid int NOT NULL default '0', PRIMARY KEY (fid,cid) + FOREIGN KEY (fid) + REFERENCES {aggregator_feed} (fid) + ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (cid) + REFERENCES {aggregator_category} (cid) + ON UPDATE CASCADE ON DELETE CASCADE )"); db_query("CREATE TABLE {aggregator_category_item} ( iid int NOT NULL default '0', cid int NOT NULL default '0', PRIMARY KEY (iid,cid) + FOREIGN KEY (iid) + REFERENCES {aggregator_item} (iid) + ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (cid) + REFERENCES {aggregator_category} (cid) + ON UPDATE CASCADE ON DELETE CASCADE )"); db_query("CREATE TABLE {aggregator_feed} ( Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.324 diff -u -p -r1.324 aggregator.module --- modules/aggregator/aggregator.module 26 Dec 2006 10:28:12 -0000 1.324 +++ modules/aggregator/aggregator.module 20 Jan 2007 01:57:41 -0000 @@ -1,1407 +0,0 @@ -'. t('The news aggregator is a powerful on-site RSS syndicator/news reader that can gather fresh content from news sites and weblogs around the web.') .'
'; - $output .= ''. t('Users can view the latest news chronologically in the main news aggregator display or by source. Administrators can add, edit and delete feeds and choose how often to check for newly updated news for each individual feed. Administrators can also tag individual feeds with categories, offering selective grouping of some feeds into separate displays. Listings of the latest news for individual sources or categorized sources can be enabled as blocks for display in the sidebar through the block administration page. The news aggregator requires cron to check for the latest news from the sites to which you have subscribed. Drupal also provides a machine-readable OPML file of all of your subscribed feeds.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'))) .'
'; - $output .= ''. t('For more information please read the configuration and customization handbook Aggregator page.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'
'; - return $output; - case 'admin/content/aggregator': - return ''. t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.', array('@block' => url('admin/build/block'))) .'
'; - case 'admin/content/aggregator/add/feed': - return ''. t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.') .'
'; - case 'admin/content/aggregator/add/category': - return ''. t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.') .'
'; - } -} - -/** - * Implementation of hook_menu(). - */ -function aggregator_menu($may_cache) { - $items = array(); - $edit = user_access('administer news feeds'); - $view = user_access('access news feeds'); - - if ($may_cache) { - $items[] = array('path' => 'admin/content/aggregator', - 'title' => t('News aggregator'), - 'description' => t("Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized."), - 'callback' => 'aggregator_admin_overview', - 'access' => $edit); - $items[] = array('path' => 'admin/content/aggregator/add/feed', - 'title' => t('Add feed'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_feed'), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/content/aggregator/add/category', - 'title' => t('Add category'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_category'), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/content/aggregator/remove', - 'title' => t('Remove items'), - 'callback' => 'aggregator_admin_remove_feed', - 'access' => $edit, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/content/aggregator/update', - 'title' => t('Update items'), - 'callback' => 'aggregator_admin_refresh_feed', - 'access' => $edit, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'admin/content/aggregator/list', - 'title' => t('List'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10); - $items[] = array('path' => 'admin/content/aggregator/settings', - 'title' => t('Settings'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_admin_settings'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 10, - 'access' => $edit); - - $items[] = array('path' => 'aggregator', - 'title' => t('News aggregator'), - 'callback' => 'aggregator_page_last', - 'access' => $view, - 'weight' => 5); - $items[] = array('path' => 'aggregator/sources', - 'title' => t('Sources'), - 'callback' => 'aggregator_page_sources', - 'access' => $view); - $items[] = array('path' => 'aggregator/categories', - 'title' => t('Categories'), - 'callback' => 'aggregator_page_categories', - 'access' => $view, - 'type' => MENU_ITEM_GROUPING); - $items[] = array('path' => 'aggregator/rss', - 'title' => t('RSS feed'), - 'callback' => 'aggregator_page_rss', - 'access' => $view, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'aggregator/opml', - 'title' => t('OPML feed'), - 'callback' => 'aggregator_page_opml', - 'access' => $view, - 'type' => MENU_CALLBACK); - - $result = db_query('SELECT title, cid FROM {aggregator_category} ORDER BY title'); - while ($category = db_fetch_array($result)) { - $items[] = array('path' => 'aggregator/categories/'. $category['cid'], - 'title' => $category['title'], - 'callback' => 'aggregator_page_category', - 'access' => $view); - } - } - else { - // Add the CSS for this module - // We put this in !$may_cache so it's only added once per request - drupal_add_css(drupal_get_path('module', 'aggregator') .'/aggregator.css'); - - if (arg(0) == 'aggregator' && is_numeric(arg(2))) { - if (arg(1) == 'sources') { - $feed = aggregator_get_feed(arg(2)); - if ($feed) { - $items[] = array('path' => 'aggregator/sources/'. $feed['fid'], - 'title' => $feed['title'], - 'callback' => 'aggregator_page_source', - 'access' => $view, - 'type' => MENU_CALLBACK); - $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/view', - 'title' => t('View'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10); - $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/categorize', - 'title' => t('Categorize'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_page_source'), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/configure', - 'title' => t('Configure'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_feed', $feed), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK, - 'weight' => 1); - } - } - else if (arg(1) == 'categories') { - $category = aggregator_get_category(arg(2)); - if ($category) { - $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/view', - 'title' => t('View'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10); - $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/categorize', - 'title' => t('Categorize'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_page_category'), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/configure', - 'title' => t('Configure'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_category', $category), - 'access' => $edit, - 'type' => MENU_LOCAL_TASK, - 'weight' => 1); - } - } - } - else if (arg(2) == 'aggregator' && is_numeric(arg(5))) { - if (arg(4) == 'feed') { - $feed = aggregator_get_feed(arg(5)); - if ($feed) { - $items[] = array('path' => 'admin/content/aggregator/edit/feed/'. $feed['fid'], - 'title' => t('Edit feed'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_feed', $feed), - 'access' => $edit, - 'type' => MENU_CALLBACK); - } - } - else { - $category = aggregator_get_category(arg(5)); - if ($category) { - $items[] = array('path' => 'admin/content/aggregator/edit/category/'. $category['cid'], - 'title' => t('Edit category'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('aggregator_form_category', $category), - 'access' => $edit, - 'type' => MENU_CALLBACK); - } - } - } - } - - return $items; -} - -function aggregator_admin_settings() { - $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items'); - $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); - - $form['aggregator_allowed_html_tags'] = array( - '#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#size' => 80, '#maxlength' => 255, - '#default_value' => variable_get('aggregator_allowed_html_tags', ' '),
- '#description' => t('The list of tags which are allowed in feeds, i.e., which will not be removed by Drupal.')
- );
-
- $form['aggregator_summary_items'] = array(
- '#type' => 'select', '#title' => t('Items shown in sources and categories pages') ,
- '#default_value' => variable_get('aggregator_summary_items', 3), '#options' => $items,
- '#description' => t('The number of items which will be shown with each feed or category in the feed and category summary pages.')
- );
-
- $form['aggregator_clear'] = array(
- '#type' => 'select', '#title' => t('Discard news items older than'),
- '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period,
- '#description' => t('Older news items will be automatically discarded. Requires crontab.')
- );
-
- $form['aggregator_category_selector'] = array(
- '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'checkboxes'),
- '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
- '#description' => t('The type of category selection widget which is shown on categorization pages. Checkboxes are easier to use; a multiple selector is good for working with large numbers of categories.')
- );
-
- return system_settings_form($form);
-}
-
-/**
- * Implementation of hook_perm().
- */
-function aggregator_perm() {
- return array('administer news feeds', 'access news feeds');
-}
-
-/**
- * Implementation of hook_cron().
- *
- * Checks news feeds for updates once their refresh interval has elapsed.
- */
-function aggregator_cron() {
- $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < %d', time());
- while ($feed = db_fetch_array($result)) {
- aggregator_refresh($feed);
- }
-}
-
-/**
- * Implementation of hook_block().
- *
- * Generates blocks for the latest news items in each category and feed.
- */
-function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
- if (user_access('access news feeds')) {
- if ($op == 'list') {
- $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
- while ($category = db_fetch_object($result)) {
- $block['category-'. $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title));
- }
- $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid');
- while ($feed = db_fetch_object($result)) {
- $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title));
- }
- }
- else if ($op == 'configure') {
- list($type, $id) = explode('-', $delta);
- if ($type == 'category') {
- $value = db_result(db_query('SELECT block FROM {aggregator_category} WHERE cid = %d', $id));
- }
- else {
- $value = db_result(db_query('SELECT block FROM {aggregator_feed} WHERE fid = %d', $id));
- }
- $form['block'] = array('#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $value, '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
- return $form;
- }
- else if ($op == 'save') {
- list($type, $id) = explode('-', $delta);
- if ($type == 'category') {
- $value = db_query('UPDATE {aggregator_category} SET block = %d WHERE cid = %d', $edit['block'], $id);
- }
- else {
- $value = db_query('UPDATE {aggregator_feed} SET block = %d WHERE fid = %d', $edit['block'], $id);
- }
- }
- else if ($op == 'view') {
- list($type, $id) = explode('-', $delta);
- switch ($type) {
- case 'feed':
- if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
- $block['subject'] = check_plain($feed->title);
- $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
- $read_more = '
'. t('Feed overview') .'
';
-
- $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
- $rows = array();
- while ($feed = db_fetch_object($result)) {
- $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(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - 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);
-
- $result = db_query('SELECT c.cid, c.title, count(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title');
-
- $output .= ''. t('Category overview') .'
';
-
- $header = array(t('Title'), t('Items'), t('Operations'));
- $rows = array();
- while ($category = db_fetch_object($result)) {
- $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '@count items'), l(t('edit'), "admin/content/aggregator/edit/category/$category->cid"));
- }
- $output .= theme('table', $header, $rows);
-
- return $output;
-}
-
-/**
- * Menu callback; removes all items from a feed, then redirects to the overview page.
- */
-function aggregator_admin_remove_feed($feed) {
- aggregator_remove(aggregator_get_feed($feed));
- drupal_goto('admin/content/aggregator');
-}
-
-/**
- * Menu callback; refreshes a feed, then redirects to the overview page.
- */
-function aggregator_admin_refresh_feed($feed) {
- aggregator_refresh(aggregator_get_feed($feed));
- drupal_goto('admin/content/aggregator');
-}
-
-/**
- * Menu callback; displays the aggregator administration page.
- */
-function aggregator_admin_overview() {
- return aggregator_view();
-}
-
-/**
- * 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));
-}
-
-/**
- * Menu callback; displays all the items captured from a particular feed.
- */
-function aggregator_page_source() {
- $feed = db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2)));
- $info = theme('aggregator_feed', $feed);
-
- return _aggregator_page_list('SELECT * FROM {aggregator_item} WHERE fid = '. $feed->fid .' ORDER BY timestamp DESC, iid DESC', arg(3), $info);
-}
-
-/**
- * Menu callback; displays all the items aggregated in a particular category.
- */
-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));
-}
-
-function aggregator_page_list($sql, $header, $categorize) {
- $form['#base'] = 'aggregator_page_list';
- $form['header'] = array('#value' => $header);
- $result = pager_query($sql, 20);
- $categories = array();
- $done = FALSE;
- $form['items'] = array();
- $form['categories'] = array('#tree' => TRUE);
- while ($item = db_fetch_object($result)) {
- $form['items'][$item->iid] = array('#value' => theme('aggregator_page_item', $item));
- $form['categories'][$item->iid] = array();
- if ($categorize) {
- $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid);
- $selected = array();
- while ($category = db_fetch_object($categories_result)) {
- if (!$done) {
- $categories[$category->cid] = check_plain($category->title);
- }
- if ($category->iid) {
- $selected[] = $category->cid;
- }
- }
- $done = TRUE;
- $form['categories'][$item->iid] = array(
- '#type' => variable_get('aggregator_category_selector', 'checkboxes'),
- '#default_value' => $selected, '#options' => $categories,
- '#size' => 10, '#multiple' => TRUE
- );
- }
- }
- $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories'));
- $form['pager'] = array('#value' => theme('pager', NULL, 20, 0));
-
- return $form;
-}
-
-/**
- * Prints an aggregator page listing a number of feed items. Various
- * menu callbacks use this function to print their feeds.
- */
-function _aggregator_page_list($sql, $op, $header = '') {
- $categorize = (user_access('administer news feeds') && ($op == 'categorize'));
- $form = aggregator_page_list($sql, $header, $categorize);
- if ($categorize) {
- return $form;
- }
- else {
- $output = ''. check_plain($feed->title) ."
\n";
-
- // Most recent items:
- $list = array();
- if (variable_get('aggregator_summary_items', 3)) {
- $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = %d ORDER BY i.timestamp DESC', $feed->fid, 0, variable_get('aggregator_summary_items', 3));
- while ($item = db_fetch_object($items)) {
- $list[] = theme('aggregator_summary_item', $item);
- }
- }
- $output .= theme('item_list', $list);
-
- $link['sources'] = array(
- 'title' => t('More'),
- 'href' => 'aggregator/sources/'. $feed->fid
- );
-
- $output .= ''. check_plain($category->title) ."
\n";
- if (variable_get('aggregator_summary_items', 3)) {
- $list = array();
- $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = %d ORDER BY i.timestamp DESC', $category->cid, 0, variable_get('aggregator_summary_items', 3));
- while ($item = db_fetch_object($items)) {
- $list[] = theme('aggregator_summary_item', $item);
- }
- $output .= theme('item_list', $list);
- }
-
- $link['categories'] = array(
- 'title' => t('More'),
- 'href' => 'aggregator/categories/'. $category->cid
- );
-
- $output .= ''. check_plain($item->title) ."
\n";
- $output .= " \n";
-
- if ($item->description) {
- $output .= '
'), -1, PREG_SPLIT_NO_EMPTY));
-}
-
-/**
- * Helper function for drupal_map_assoc.
- */
-function _aggregator_items($count) {
- return format_plural($count, '1 item', '@count items');
-}
Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.39
diff -u -p -r1.39 settings.php
--- sites/default/settings.php 14 Jan 2007 02:05:15 -0000 1.39
+++ sites/default/settings.php 20 Jan 2007 01:57:41 -0000
@@ -90,7 +90,7 @@
* $db_url = 'mysqli://username:password@localhost/databasename';
* $db_url = 'pgsql://username:password@localhost/databasename';
*/
-$db_url = 'mysql://username:password@localhost/databasename';
+$db_url = 'mysql://root:root@localhost/head';
$db_prefix = '';
/**