diff -urp blogger/blogger.info blogger_d6/blogger.info
--- blogger/blogger.info	2008-06-18 03:40:03.000000000 +0100
+++ blogger_d6/blogger.info	2008-07-03 02:50:42.340038000 +0100
@@ -2,12 +2,4 @@
 name = Blogger
 description = The Blogger module displays a list of bloggers.
 package = Merdeka
-version = "5.x-1.4"
-project = "blogger"
-datestamp = "1195369503"
-
-; Information added by drupal.org packaging script on 2008-06-18
-version = "5.x-1.4"
-project = "blogger"
-datestamp = "1213756803"
-
+core = 6.x
diff -urp blogger/blogger.module blogger_d6/blogger.module
--- blogger/blogger.module	2008-06-18 03:36:34.000000000 +0100
+++ blogger_d6/blogger.module	2008-07-03 03:07:36.532438000 +0100
@@ -9,8 +9,8 @@
 /**
  * Implementation of hook_help().
  */
-function blogger_help($section) {
-  switch ($section) {
+function blogger_help($path, $arg) {
+  switch ($path) {
     case 'admin/help#blogger':
       $output = '<p>'. t('The Blogger module displays a list of bloggers.') .'</p>';
       $output .= t("<p>You can configure:"
@@ -138,25 +138,25 @@ function blogger_admin_settings() {
  * Menu callback. Prints a listing of active nodes on the site.
  */
 
-function blogger_menu($may_cache) {
+function blogger_menu() {
   // Add main CSS functionality.
   drupal_add_css(drupal_get_path('module', 'blogger') .'/blogger.css');
   $items = array();
   
-  $items[] = array(
-      'path' => 'admin/settings/blogger',
-      'title' => t('Blogger'),
-      'description' => t('Control how blogger displayed.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('blogger_admin_settings'),
-      'access' => user_access('administer blogger'),
+  $items['admin/settings/blogger'] = array(
+      'title' => 'Blogger',
+      'description' => 'Control how blogger displayed.',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('blogger_admin_settings'),
+      'access callback' => 'user_access',
+      'access arguments' => array('administer blogger'),
       'type' => MENU_NORMAL_ITEM);
 
-  $items[] = array(
-      'path' => 'blogger/list',
-      'title' => t('Blogger'),
-      'callback' => 'blogger_page_list',
-      'access' => user_access('access blogger'),
+  $items['blogger/list'] = array(
+      'title' => 'Blogger',
+      'page callback' => 'blogger_page_list',
+      'access callback' => user_access('access blogger'),
+      'access arguments' => user_access('access blogger'),
       'type' => MENU_CALLBACK);
       
   return $items;
@@ -189,7 +189,7 @@ function blogger_block($op = 'list', $de
 	
 	if ($blogger_on_blog_only) {
 	  if (arg(0) != 'blog') {
-	    if (arg(0) == 'node' && is_numeric(arg(1))) {
+	    if ($node = menu_get_object()) {
           $node = node_load(arg(1));
           $content_type = $node->type;
           if ($content_type!='blog') {return FALSE;}	
@@ -216,10 +216,11 @@ function blogger_block($op = 'list', $de
 	
 	$block_content = '<div id="blogger">';
 	
-	if (!db_num_rows($results)) {
-	  $block_content .= 'No blogger';
-	  $block_content .= '</div>';
-    } else { 
+//	if (!$results) {
+//	  $block_content .= 'No blogger';
+//	  $block_content .= '</div>';
+//    } else
+ { 
 	
 	$block_content .= '<table>';
 	$i = 0;
@@ -290,14 +291,13 @@ function blogger_page_list() 
   $blogger_avatar_width = variable_get("blogger_avatar_width", 0);
   $blogger_avatar_height = variable_get("blogger_avatar_height", 0);
   
-  $sql_counts = " SELECT DISTINCT (u.name)"
+  $sql_counts = " SELECT COUNT(DISTINCT (u.name))"
 	           ." FROM {users} u"
 	           ." INNER JOIN {node} n ON n.uid=u.uid"
 	           ." WHERE u.name<>'' AND n.type='blog' AND n.status=1"
 		       ;
   $dse_sql_counts = db_query($sql_counts);
-  $cnt_sql_counts = db_num_rows($dse_sql_counts);
-  $sql_counts = "SELECT $cnt_sql_counts";
+  $sql_counts = "SELECT $dse_sql_counts";
 	
   $sql = " SELECT n.uid, u.name, count(u.name) AS numitems, u.picture, n.title "
       ." FROM {node} n "