'),
- '#description' => t('A space-separated list of HTML tags allowed in the content of feed items. (Tags in this list are not removed by Drupal.)')
+ '#description' => t('A space-separated list of HTML tags allowed in the content of feed items. (Tags in this list are not removed by Drupal.)'),
);
$form['aggregator_summary_items'] = array(
- '#type' => 'select', '#title' => t('Items shown in sources and categories pages') ,
+ '#type' => 'select', '#title' => t('Items shown in sources and categories pages'),
'#default_value' => variable_get('aggregator_summary_items', 3), '#options' => $items,
- '#description' => t('Number of feed items displayed in feed and category summary pages.')
+ '#description' => t('Number of feed items displayed in feed and category summary pages.'),
);
$form['aggregator_clear'] = array(
'#type' => 'select', '#title' => t('Discard items older than'),
'#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period,
- '#description' => t('The length of time to retain feed items before discarding. (Requires a correctly configured cron maintenance task.)', array('@cron' => url('admin/reports/status')))
+ '#description' => t('The length of time to retain feed items before discarding. (Requires a correctly configured cron maintenance task.)', array('@cron' => url('admin/reports/status'))),
);
$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 displayed on categorization pages. (For a small number of categories, checkboxes are easier to use, while a multiple selector work well with large numbers of categories.)')
+ '#description' => t('The type of category selection widget displayed on categorization pages. (For a small number of categories, checkboxes are easier to use, while a multiple selector work well with large numbers of categories.)'),
);
return system_settings_form($form);
@@ -339,3 +340,4 @@ function aggregator_form_category_submit
drupal_set_message(t('The category %category has been added.', array('%category' => $form_state['values']['title'])));
}
}
+
Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.14
diff -u -p -r1.14 aggregator.install
--- modules/aggregator/aggregator.install 18 Dec 2007 12:59:20 -0000 1.14
+++ modules/aggregator/aggregator.install 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
t('Stores categories for aggregator feeds and feed items.'),
'fields' => array(
- 'cid' => array(
+ 'cid' => array(
'type' => 'serial',
'not null' => TRUE,
'description' => t('Primary Key: Unique aggregator category ID.'),
@@ -53,7 +54,7 @@ function aggregator_schema() {
'default' => 0,
'size' => 'tiny',
'description' => t('The number of recent items to show within the category block.'),
- )
+ ),
),
'primary key' => array('cid'),
'unique keys' => array('title' => array('title')),
@@ -73,7 +74,7 @@ function aggregator_schema() {
'not null' => TRUE,
'default' => 0,
'description' => t('The {aggregator_category}.cid to which the feed is being assigned.'),
- )
+ ),
),
'primary key' => array('cid', 'fid'),
'indexes' => array('fid' => array('fid')),
@@ -93,7 +94,7 @@ function aggregator_schema() {
'not null' => TRUE,
'default' => 0,
'description' => t('The {aggregator_category}.cid to which the feed item is being assigned.'),
- )
+ ),
),
'primary key' => array('cid', 'iid'),
'indexes' => array('iid' => array('iid')),
@@ -171,11 +172,11 @@ function aggregator_schema() {
'default' => 0,
'size' => 'tiny',
'description' => t("Number of items to display in the feed's block."),
- )
+ ),
),
'primary key' => array('fid'),
'unique keys' => array(
- 'url' => array('url'),
+ 'url' => array('url'),
'title' => array('title'),
),
);
@@ -183,7 +184,7 @@ function aggregator_schema() {
$schema['aggregator_item'] = array(
'description' => t('Stores the individual items imported from feeds.'),
'fields' => array(
- 'iid' => array(
+ 'iid' => array(
'type' => 'serial',
'not null' => TRUE,
'description' => t('Primary Key: Unique ID for feed item.'),
@@ -231,7 +232,7 @@ function aggregator_schema() {
'length' => 255,
'not null' => FALSE,
'description' => t('Unique identifier for the feed item.'),
- )
+ ),
),
'primary key' => array('iid'),
'indexes' => array('fid' => array('fid')),
@@ -239,3 +240,4 @@ function aggregator_schema() {
return $schema;
}
+
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.374
diff -u -p -r1.374 aggregator.module
--- modules/aggregator/aggregator.module 15 Jan 2008 08:06:32 -0000 1.374
+++ modules/aggregator/aggregator.module 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
'. t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the blocks administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) .'
';
$output .= ''. t('For more information, see the online handbook entry for Aggregator module.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'
';
return $output;
+
case 'admin/content/aggregator':
$output = ''. t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'hsttp://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) .'
';
$output .= ''. t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) .'
';
return $output;
+
case 'admin/content/aggregator/add/feed':
return ''. t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') .'
';
+
case 'admin/content/aggregator/add/category':
return ''. t('Categories allow feed items from different feeds to be grouped together. For example, several sport-related feeds may belong to a category named Sports. Feed items may be grouped automatically (by selecting a category when creating or editing a feed) or manually (via the Categorize page available from feed item listings). Each category provides its own feed page and block.') .'
';
}
@@ -335,16 +339,16 @@ function aggregator_block($op = 'list',
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 = theme('more_link', url('aggregator/sources/'. $feed->fid), t("View this feed's recent news."));
+ $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
+ $read_more = theme('more_link', url('aggregator/sources/'. $feed->fid), t("View this feed's recent news."));
}
break;
case 'category':
if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
$block['subject'] = check_plain($category->title);
- $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
- $read_more = theme('more_link', url('aggregator/categories/'. $category->cid), t("View this category's recent news."));
+ $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
+ $read_more = theme('more_link', url('aggregator/categories/'. $category->cid), t("View this category's recent news."));
}
break;
}
@@ -474,6 +478,7 @@ function aggregator_element_start($parse
case 'INFO':
$element = $name;
break;
+
case 'ID':
if ($element != 'ITEM') {
$element = $name;
@@ -488,10 +493,12 @@ function aggregator_element_start($parse
}
}
break;
+
case 'ITEM':
$element = $name;
$item += 1;
break;
+
case 'ENTRY':
$element = 'ITEM';
$item += 1;
@@ -516,6 +523,7 @@ function aggregator_element_end($parser,
case 'INFO':
$element = '';
break;
+
case 'ID':
if ($element == 'ID') {
$element = '';
@@ -534,36 +542,43 @@ function aggregator_element_data($parser
$items[$item] += array($tag => '');
$items[$item][$tag] .= $data;
break;
+
case 'IMAGE':
case 'LOGO':
$image += array($tag => '');
$image[$tag] .= $data;
break;
+
case 'LINK':
if ($data) {
$items[$item] += array($tag => '');
$items[$item][$tag] .= $data;
}
break;
+
case 'CONTENT':
$items[$item] += array('CONTENT' => '');
$items[$item]['CONTENT'] .= $data;
break;
+
case 'SUMMARY':
$items[$item] += array('SUMMARY' => '');
$items[$item]['SUMMARY'] .= $data;
break;
+
case 'TAGLINE':
case 'SUBTITLE':
$channel += array('DESCRIPTION' => '');
$channel['DESCRIPTION'] .= $data;
break;
+
case 'INFO':
case 'ID':
case 'TEXTINPUT':
// The sub-element is not supported. However, we must recognize
// it or its contents will end up in the item array.
break;
+
default:
$channel += array($tag => '');
$channel[$tag] .= $data;
@@ -597,6 +612,7 @@ function aggregator_refresh($feed) {
db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']);
drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed['title'])));
break;
+
case 301:
$feed['url'] = $result->redirect_url;
watchdog('aggregator', 'Updated URL for feed %title to %url.', array('%title' => $feed['title'], '%url' => $feed['url']));
@@ -654,6 +670,7 @@ function aggregator_refresh($feed) {
*
* @param $date_str
* A string with a potentially W3C DTF date.
+ *
* @return
* A timestamp if parsed successfully or FALSE if not.
*/
@@ -662,7 +679,8 @@ function aggregator_parse_w3cdtf($date_s
list($year, $month, $day, $hours, $minutes, $seconds) = array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
// calc epoch for current date assuming GMT
$epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
- if ($match[10] != 'Z') { // Z is zulu time, aka GMT
+ // Z is zulu time, aka GMT
+ if ($match[10] != 'Z') {
list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]);
// zero out the variables
if (!$tz_hour) {
@@ -692,6 +710,7 @@ function aggregator_parse_w3cdtf($date_s
* The feed data.
* @param $feed
* An associative array describing the feed to be parsed.
+ *
* @return
* 0 on error, 1 otherwise.
*/
@@ -700,8 +719,8 @@ function aggregator_parse_feed(&$data, $
// Unset the global variables before we use them:
unset($GLOBALS['element'], $GLOBALS['item'], $GLOBALS['tag']);
- $items = array();
- $image = array();
+ $items = array();
+ $image = array();
$channel = array();
// parse the data:
@@ -773,11 +792,14 @@ function aggregator_parse_feed(&$data, $
}
}
- $timestamp = strtotime($date); // As of PHP 5.1.0, strtotime returns FALSE on failure instead of -1.
+ // As of PHP 5.1.0, strtotime returns FALSE on failure instead of -1.
+ $timestamp = strtotime($date);
if ($timestamp <= 0) {
- $timestamp = aggregator_parse_w3cdtf($date); // Returns FALSE on failure
+ // Returns FALSE on failure
+ $timestamp = aggregator_parse_w3cdtf($date);
if (!$timestamp) {
- $timestamp = time(); // better than nothing
+ // better than nothing
+ $timestamp = time();
}
}
@@ -794,7 +816,7 @@ function aggregator_parse_feed(&$data, $
$entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title));
}
$item += array('AUTHOR' => '', 'DESCRIPTION' => '');
- aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid: ''), 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $guid));
+ aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $guid));
}
// Remove all items that are older than flush item timer.
@@ -845,6 +867,7 @@ function aggregator_save_item($edit) {
*
* @param $fid
* The feed id.
+ *
* @return
* An associative array describing the feed.
*/
@@ -861,6 +884,7 @@ function aggregator_feed_load($fid) {
*
* @param $cid
* The category id.
+ *
* @return
* An associative array describing the category.
*/
@@ -879,6 +903,7 @@ function aggregator_category_load($cid)
* The item to be displayed.
* @param $feed
* Not used.
+ *
* @return
* The item HTML.
* @ingroup themeable
@@ -904,6 +929,7 @@ function theme_aggregator_block_item($it
*
* @param $value
* The content to be filtered.
+ *
* @return
* The filtered content.
*/
@@ -916,9 +942,11 @@ function aggregator_filter_xss($value) {
*
* @param $count
* Items count.
+ *
* @return
* Plural-formatted "@count items"
*/
function _aggregator_items($count) {
return format_plural($count, '1 item', '@count items');
}
+
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.12
diff -u -p -r1.12 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc 8 Jan 2008 10:35:40 -0000 1.12
+++ modules/aggregator/aggregator.pages.inc 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
$feed_source);
- $categories = array();
- $done = FALSE;
- $form['items'] = array();
- $form['categories'] = array('#tree' => TRUE);
+ $categories = array();
+ $done = FALSE;
+ $form['items'] = array();
+ $form['categories'] = array('#tree' => TRUE);
foreach ($items as $item) {
$form['items'][$item->iid] = array('#value' => theme('aggregator_item', $item));
$form['categories'][$item->iid] = array();
@@ -169,7 +175,7 @@ function aggregator_categorize_items($it
'#default_value' => $selected,
'#options' => $categories,
'#size' => 10,
- '#multiple' => TRUE
+ '#multiple' => TRUE,
);
}
$form['submit'] = array('#type' => 'submit', '#value' => t('Save categories'));
@@ -208,6 +214,7 @@ function aggregator_categorize_items_sub
*
* @param $form
* An associative array containing the structure of the form.
+ *
* @return
* The output HTML.
* @ingroup themeable
@@ -325,14 +332,14 @@ function aggregator_page_rss() {
// arg(2) is the passed cid, only select for that category
if (arg(2)) {
$category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
- $sql = '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 = %d ORDER BY timestamp DESC, i.iid DESC';
- $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10));
+ $sql = '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 = %d ORDER BY timestamp DESC, i.iid DESC';
+ $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10));
}
// or, get the default aggregator items
else {
$category = NULL;
- $sql = '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';
- $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
+ $sql = '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';
+ $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
}
$feeds = array();
@@ -365,6 +372,7 @@ function theme_aggregator_page_rss($feed
}
$feed->description = $teaser;
break;
+
case 'title':
$feed->description = '';
break;
@@ -372,8 +380,8 @@ function theme_aggregator_page_rss($feed
$items .= format_rss_item($feed->ftitle .': '. $feed->title, $feed->link, $feed->description, array('pubDate' => date('r', $feed->timestamp)));
}
- $site_name = variable_get('site_name', 'Drupal');
- $url = url((isset($category) ? 'aggregator/categories/'. $category->cid : 'aggregator'), array('absolute' => TRUE));
+ $site_name = variable_get('site_name', 'Drupal');
+ $url = url((isset($category) ? 'aggregator/categories/'. $category->cid : 'aggregator'), array('absolute' => TRUE));
$description = isset($category) ? t('@site_name - aggregated feeds in category @title', array('@site_name' => $site_name, '@title' => $category->title)) : t('@site_name - aggregated feeds', array('@site_name' => $site_name));
$output = "\n";
@@ -389,6 +397,7 @@ function theme_aggregator_page_rss($feed
*
* @param $cid
* If set, feeds are exported only from a category with this ID. Otherwise, all feeds are exported.
+ *
* @return
* The output XML.
*/
@@ -490,3 +499,4 @@ function template_preprocess_aggregator_
$variables['last_checked'] = l($variables['last_checked'], 'admin/content/aggregator');
}
}
+
Index: modules/block/block-admin-display-form.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block-admin-display-form.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 block-admin-display-form.tpl.php
--- modules/block/block-admin-display-form.tpl.php 16 Jan 2008 22:57:26 -0000 1.3
+++ modules/block/block-admin-display-form.tpl.php 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
+
$title) {
- drupal_add_tabledrag('blocks', 'match', 'sibling', 'block-region-select', 'block-region-'. $region, NULL, FALSE);
- drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight', 'block-weight-'. $region);
- }
+// Add table javascript.
+drupal_add_js('misc/tableheader.js'); drupal_add_js(drupal_get_path('module', 'block') .'/block.js');
+foreach ($block_regions as $region => $title) {
+ drupal_add_tabledrag('blocks', 'match', 'sibling', 'block-region-select', 'block-region-'. $region, NULL, FALSE);
+ drupal_add_tabledrag('blocks', 'order', 'sibling', 'block-weight', 'block-weight-'. $region);
+}
?>
@@ -41,7 +42,8 @@
|
|
|
-
+
|
|
@@ -49,28 +51,36 @@
- $title): ?>
+
+ $title):
+?>
|
|
- $data): ?>
-
+ $data):
+?>
+
| block_title; ?> |
region_select; ?> |
weight_select; ?> |
-
+
throttle_check; ?> |
configure_link; ?> |
delete_link; ?> |
-
-
+
+
+
+
-
+ $block['delta'],
);
$form[$key]['info'] = array(
- '#value' => check_plain($block['info'])
+ '#value' => check_plain($block['info']),
);
$form[$key]['theme'] = array(
'#type' => 'hidden',
- '#value' => $theme_key
+ '#value' => $theme_key,
);
$form[$key]['weight'] = array(
'#type' => 'weight',
@@ -186,7 +187,7 @@ function block_admin_configure(&$form_st
'#options' => array(
t('Users cannot control whether or not they see this block.'),
t('Show this block by default, but let individual users hide it.'),
- t('Hide this block by default but let individual users show it.')
+ t('Hide this block by default but let individual users show it.'),
),
'#description' => t('Allow individual users to customize the visibility of this block in their account settings.'),
'#default_value' => $edit['custom'],
@@ -322,9 +323,9 @@ function block_add_block_form_submit($fo
* Menu callback; confirm deletion of custom blocks.
*/
function block_box_delete(&$form_state, $bid = 0) {
- $box = block_box_get($bid);
+ $box = block_box_get($bid);
$form['info'] = array('#type' => 'hidden', '#value' => $box['info'] ? $box['info'] : $box['title']);
- $form['bid'] = array('#type' => 'hidden', '#value' => $bid);
+ $form['bid'] = array('#type' => 'hidden', '#value' => $bid);
return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $box['info'])), 'admin/build/block', '', t('Delete'), t('Cancel'));
}
@@ -383,7 +384,7 @@ function template_preprocess_block_admin
$variables['block_listing'][$region][$i]->row_class = isset($block['#attributes']['class']) ? $block['#attributes']['class'] : '';
$variables['block_listing'][$region][$i]->block_modified = isset($block['#attributes']['class']) && strpos($block['#attributes']['class'], 'block-modified') !== FALSE ? TRUE : FALSE;
- $variables['block_listing'][$region][$i]->block_title = drupal_render($block['info']);
+ $variables['block_listing'][$region][$i]->block_title = drupal_render($block['info']);
$variables['block_listing'][$region][$i]->region_select = drupal_render($block['region']) . drupal_render($block['theme']);
$variables['block_listing'][$region][$i]->weight_select = drupal_render($block['weight']);
$variables['block_listing'][$region][$i]->throttle_check = $variables['throttle'] ? drupal_render($block['throttle']) : '';
@@ -397,3 +398,4 @@ function template_preprocess_block_admin
$variables['form_submit'] = drupal_render($variables['form']);
}
+
Index: modules/block/block.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.install,v
retrieving revision 1.8
diff -u -p -r1.8 block.install
--- modules/block/block.install 18 Dec 2007 12:59:20 -0000 1.8
+++ modules/block/block.install 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
TRUE,
'description' => t("The block's origin module, from {blocks}.module."),
),
- 'delta' => array(
+ 'delta' => array(
'type' => 'varchar',
'length' => 32,
'not null' => TRUE,
@@ -130,7 +131,7 @@ function block_schema() {
'primary key' => array(
'module',
'delta',
- 'rid'
+ 'rid',
),
'indexes' => array(
'rid' => array('rid'),
@@ -142,7 +143,7 @@ function block_schema() {
'fields' => array(
'bid' => array(
'type' => 'serial',
- 'unsigned' => TRUE,
+ 'unsigned' => TRUE,
'not null' => TRUE,
'description' => t("The block's {blocks}.bid."),
),
@@ -165,7 +166,7 @@ function block_schema() {
'not null' => TRUE,
'default' => 0,
'description' => t("Block body's {filter_formats}.format; for example, 1 = Filtered HTML."),
- )
+ ),
),
'unique keys' => array('info' => array('info')),
'primary key' => array('bid'),
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.297
diff -u -p -r1.297 block.module
--- modules/block/block.module 24 Dec 2007 10:33:39 -0000 1.297
+++ modules/block/block.module 21 Jan 2008 21:58:50 -0000
@@ -1,6 +1,7 @@
'. t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') .'