Index: cvs.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.install,v
retrieving revision 1.16
diff -u -p -r1.16 cvs.install
--- cvs.install	10 Feb 2009 07:20:47 -0000	1.16
+++ cvs.install	11 Apr 2009 23:39:06 -0000
@@ -408,3 +408,13 @@ function cvs_update_6000() {
   return $ret;
 }
 
+/**
+ * Fix deltas for CVS blocks.
+ */
+function cvs_update_6001() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {blocks} SET delta = 'cvs_site_active_developers' WHERE delta = '0' AND module = 'cvs'");
+  $ret[] = update_sql("UPDATE {blocks} SET delta = 'cvs_site_active_projects' WHERE delta = '1' AND module = 'cvs'");
+  return $ret;
+}
+
Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.226
diff -u -p -r1.226 cvs.module
--- cvs.module	11 Mar 2009 18:09:16 -0000	1.226
+++ cvs.module	11 Apr 2009 23:39:06 -0000
@@ -1222,22 +1222,35 @@ function cvs_project_release_form_pre_re
   }
 }
 
-/** Implementation of hook_block().
- *
+/**
+ * Implementation of hook_block().
  */
 function cvs_block($op = 'list', $delta = 0) {
   if ($op == 'list') {
-    $blocks[0]['info'] = t('Most active developers');
-    $blocks[0]['cache'] = BLOCK_CACHE_GLOBAL;
-    $blocks[1]['info'] = t('Most active projects');
-    $blocks[1]['cache'] = BLOCK_CACHE_GLOBAL;
+    $blocks['cvs_site_active_developers'] = array(
+      'info' => t('CVS: Most active developers'),
+      'cache' => BLOCK_CACHE_GLOBAL,
+    );
+    $blocks['cvs_site_active_projects'] = array(
+      'info' => t('CVS: Most active projects'),
+      'cache' => BLOCK_CACHE_GLOBAL,
+    );
     return $blocks;
   }
   else if ($op == 'view') {
-    $interval = 7 * 24 * 60 * 60;
-    $length = 15;
+    return cvs_block_view($delta);
+  }
+}
 
-    if ($delta == 0) {
+/**
+ * Implementation of hook_block() for the 'view' operation.
+ */
+function cvs_block_view($delta) {
+  $interval = 7 * 24 * 60 * 60;
+  $length = 15;
+  $block = array();
+  switch ($delta) {
+    case 'cvs_site_active_developers':
       $result = db_query_range("SELECT COUNT(m.cid) AS count, m.uid, u.name FROM {cvs_messages} m INNER JOIN {users} u ON m.uid = u.uid AND m.uid != 0 AND m.created > %d GROUP BY m.uid ORDER BY count DESC", time() - $interval, 0, $length);
       while ($account = db_fetch_object($result)) {
         $accounts[] = '<li>'. theme('username', $account) .'</li>';
@@ -1245,10 +1258,10 @@ function cvs_block($op = 'list', $delta 
       if ($accounts) {
         $block['subject'] = t('Most active developers');
         $block['content'] = '<ul>'. implode($accounts) .'</ul>';
-        return $block;
       }
-    }
-    else if ($delta == 1) {
+      break;
+
+    case 'cvs_site_active_projects':
       $result = db_query_range("SELECT COUNT(m.cid) AS count, n.nid, n.title FROM {cvs_files} f INNER JOIN {cvs_messages} m ON f.cid = m.cid INNER JOIN {node} n ON f.nid = n.nid AND n.status = 1 AND m.created > %d GROUP BY n.nid ORDER BY count DESC", time() - $interval, 0, $length);
       while ($project = db_fetch_object($result)) {
         $projects[] = '<li>'. l($project->title, 'node/'. $project->nid) .'</li>';
@@ -1256,10 +1269,11 @@ function cvs_block($op = 'list', $delta 
       if ($projects) {
         $block['subject'] = t('Most active projects');
         $block['content'] = '<ul>'. implode($projects) .'</ul>';
-        return $block;
       }
-    }
+      break;
+
   }
+  return $block;
 }
 
 function _cvs_date($timestamp) {