diff -ru recent_blocks/recent_blocks.info recent_blocks/recent_blocks.info
--- recent_blocks/recent_blocks.info	2007-04-04 14:15:48.000000000 -0700
+++ recent_blocks/recent_blocks.info	2008-09-22 23:16:19.000000000 -0700
@@ -2,3 +2,10 @@
 name = Recent Blocks
 description = Make your own customizable blocks for displaying recent content.
 package = Other
+core = 6.x
+
+; Information added by drupal.org packaging script on 2007-08-29
+version = "6.x-1.0-dev"
+project = "recent_blocks"
+datestamp = "1188425105"
+
diff -ru recent_blocks/recent_blocks.module recent_blocks/recent_blocks.module
--- recent_blocks/recent_blocks.module	2007-08-29 14:44:36.000000000 -0700
+++ recent_blocks/recent_blocks.module	2008-09-22 17:17:56.000000000 -0700
@@ -5,46 +5,47 @@
   return array('administer recent blocks');
 }
 
-function recent_blocks_menu($may_cache) {
-  global $user;
+function recent_blocks_menu() {
   $items = array();
 
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/build/recent_blocks/add', 
-      'title' => t('Add a new block'),
-      'access' => user_access('administer recent blocks'), 
-      'description' => t('add blocks for specific content types'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('_recent_blocks_add'),
-      'type' => MENU_NORMAL_ITEM,
-      );
-    $items[] = array(
-      'path' => 'admin/build/recent_blocks/delete', 
-      'title' => t('Delete a block'),
-      'access' => user_access('administer recent blocks'), 
-      'description' => t('remove blocks for specific content types'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('_recent_blocks_delete'),
-      'type' => MENU_NORMAL_ITEM,
-    );
-    $items[] = array(
-      'path' => 'admin/build/recent_blocks/edit', 
-      'title' => t('Edit a block'),
-      'access' => user_access('administer recent blocks'), 
-      'description' => t('edit blocks for specific content types'),
-      'callback' => 'recent_blocks_edit_page',
-      'type' => MENU_NORMAL_ITEM,
-      );
-    $items[] = array(
-      'path' => 'admin/build/recent_blocks', 
-      'title' => t('Recent Blocks'),
-      'description' => t('Administer recent blocks'),
-      'access' => user_access('administer recent blocks'),
-      'callback' => '_recent_blocks_admin',
-      'type' => MENU_NORMAL_ITEM,
-      );
-  }
+  $items['admin/build/recent_blocks/list'] = array(
+    'title' => 'Recent Blocks',
+    'description' => 'Administer recent blocks',
+    'access arguments' => array('administer recent blocks'),
+    'page callback' => '_recent_blocks_admin',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+  );
+  $items['admin/build/recent_blocks/add'] = array(
+    'title' => 'Add a new block',
+    'access arguments' => array('administer recent blocks'), 
+    'description' => 'add blocks for specific content types',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('_recent_blocks_add'),
+    'type' => MENU_LOCAL_TASK,
+  );
+  $items['admin/build/recent_blocks/delete/%'] = array(
+    'title' => 'Delete a block',
+    'access arguments' => array('administer recent blocks'), 
+    'description' => 'remove blocks for specific content types',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('_recent_blocks_delete',4),
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/build/recent_blocks/edit/%'] = array(
+    'title' => 'Edit a block',
+    'access arguments' => array('administer recent blocks'), 
+    'description' => 'edit blocks for specific content types',
+    'page callback' => 'recent_blocks_edit_page',
+    'page arguments' => array(4),
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/build/recent_blocks'] = array(
+    'title' => 'Recent Blocks',
+    'description' => 'Administer recent blocks',
+    'access arguments' => array('administer recent blocks'),
+    'page callback' => '_recent_blocks_admin',
+    'type' => MENU_NORMAL_ITEM,
+  );
   return $items; 
 }
 
@@ -73,7 +74,7 @@
     case 'list': 
       foreach (array_keys($block_deltas) as $delta) {
         $settings = variable_get("recent_blocks_$delta", _recent_blocks_get_default_settings($delta));
-        $blocks[$delta]['info'] = $settings['info'];
+        $blocks[$delta]['info'] = 'recent_blocks: ' .$settings['info'];
       }
       return $blocks;
       
@@ -88,6 +89,7 @@
 function _recent_blocks_block($s) {
   global $user;
   $types = $s['types'];
+  ### FIXME: this should be array_fill with %s's
   $common_where = "n.status = 1 AND n.type IN ('". implode("', '", $types) ."')";
   switch ($s['mode_full_wow_comments']) {
     case 'with':    $wow_comments = 'comment_count != 0'; break;
@@ -132,7 +134,7 @@
       if ($show['comments number'] && $node->comment_count) {
         $comments_no = format_plural($node->comment_count, '1 reply', '@count replies');
         if (module_exists('comment') && $new = comment_num_new($node->nid)) {
-          $comments_no .= ' '. l(format_plural($new, '1 new', '@count new'), "node/$node->nid", NULL, NULL, 'new');
+          $comments_no .= ' '. l(format_plural($new, '1 new', '@count new'), "node/$node->nid", array('fragment' => 'new'));
         }
       }
 
@@ -169,7 +171,7 @@
   drupal_goto('admin/build/recent_blocks');
 }
 
-function _recent_blocks_delete($delta) {
+function _recent_blocks_delete(&$form_state, $delta) {
   $block_deltas = variable_get('recent_blocks_deltas', array('0' => TRUE));
   if (!isset($block_deltas[$delta])) {
     drupal_set_message(t('Recent block %delta not found', array('%delta' => $delta)), 'error');
@@ -182,7 +184,7 @@
   drupal_goto('admin/build/recent_blocks');
 }
 
-function recent_blocks_edit_form($delta) {
+function recent_blocks_edit_form(&$form_state, $delta) {
 
   $block_deltas = variable_get('recent_blocks_deltas', array('0' => TRUE));
   $types = array_keys(node_get_types());
@@ -358,19 +360,19 @@
   return drupal_get_form('recent_blocks_edit_form',$delta);
 }
 
-function recent_blocks_edit_form_submit($form_id, $form_values) {
-  $delta = $form_values['delta'];
+function recent_blocks_edit_form_submit($form, &$form_state) {
+  $delta = $form_state['values']['delta'];
 
   #put node types in the format expected by _recent_blocks_block
   $types = array_keys(node_get_types());
-  $rb_types = $form_values['types'];
+  $rb_types = $form_state['values']['types'];
   foreach ($rb_types as $val) {
-    unset($form_values['types']["$val"]);
-    $form_values['types'][ $types[$val] ] = $types[$val];
+    unset($form_state['values']['types']["$val"]);
+    $form_state['values']['types'][ $types[$val] ] = $types[$val];
   }
 
-  variable_set("recent_blocks_$delta",$form_values); 
-  variable_set("recent_blocks_broken",print_r($form_values,true)); 
+  variable_set("recent_blocks_$delta",$form_state['values']); 
+  variable_set("recent_blocks_broken",print_r($form_state['values'],true)); 
   drupal_set_message(t('Your changes have been saved.'));
   return 'admin/build/recent_blocks';
 }
Only in recent_blocks: .svn