diff -urp avatar_gallery/avatar_gallery.info avatar_gallery_drupal6/avatar_gallery.info
--- avatar_gallery/avatar_gallery.info	2008-05-11 13:00:46.000000000 +0100
+++ avatar_gallery_drupal6/avatar_gallery.info	2008-05-22 20:14:07.207698700 +0100
@@ -1,9 +1,5 @@
 ; $Id: avatar_gallery.info,v 1.1 2006/12/29 22:15:55 davidlesieur Exp $
 name = Avatar Gallery
-description = "Provides a block which is a clickable JPEG of all user's avatars, with their names placed under the picture."
+description = Provides a block which is a clickable JPEG of all user's avatars, with their names placed under the picture.
+core = 6.x
 
diff -urp avatar_gallery/avatar_gallery.module avatar_gallery_drupal6/avatar_gallery.module
--- avatar_gallery/avatar_gallery.module	2008-05-11 02:55:32.000000000 +0100
+++ avatar_gallery_drupal6/avatar_gallery.module	2008-05-22 23:47:18.660698700 +0100
@@ -6,34 +6,35 @@
  *
  * @see hook_menu()
  */
-function avatar_gallery_menu($may_cache) {
+function avatar_gallery_menu() {
   $items = array();
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/settings/avatar_gallery',
-      'title' => t('Avatar gallery'),
-      'description' => t('Configure the avatar gallery.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('avatar_gallery_admin_settings'),
-      'access' => user_access('administer site configuration'),
-    $items[] = array(
-      'path' => 'admin/settings/avatar_gallery/settings',
-      'title' => t('Settings'),
-      'description' => t('Configure images and text.'),
-      'access' => user_access('administer site configuration'),
-      'type' => MENU_DEFAULT_LOCAL_TASK),
-      'weight' => 0,
-    );
-    $items[] = array(
-      'path' => 'admin/settings/avatar_gallery/view',
-      'title' => t('View'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('avatar_gallery_view'),
-      'access' => user_access('administer site configuration'),
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 1,
-    );
-  }
+
+  $items['admin/settings/avatar_gallery'] = array(
+    'title' => 'Avatar gallery',
+    'description' => 'Configure the avatar gallery.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('avatar_gallery_admin_settings'),
+    'access callback' => 'user_access',
+    'access arguments' => array('administer site configuration'),
+  );
+  $items['admin/settings/avatar_gallery/settings'] = array(
+    'title' => 'Settings',
+    'description' => 'Configure images and text.',
+    'access callback' => user_access('administer site configuration'),
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => 0,
+  );
+  $items['admin/settings/avatar_gallery/view'] = array(
+    'title' => 'View',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('avatar_gallery_view'),
+    'access callback' => 'user_access',
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 1,
+  );
+
   return $items;
 }
 
@@ -109,9 +110,9 @@ function avatar_gallery_view() {
   return $form;
 }
 
-function avatar_gallery_view_submit($form_id, $form_values) {
+function avatar_gallery_view_submit($form, &$form_state) {
   avatar_gallery_regenerate();
-  return "admin/settings/avatar_gallery/view";
+  $form_state['redirect'] = 'admin/settings/avatar_gallery/view';
 }
 
 /**
@@ -577,7 +578,7 @@ function avatar_gallery_regenerate()
   imagedestroy($dst_img);
 
   cache_clear_all('avatar_gallery_coordinates', 'cache');
-  cache_set('avatar_gallery_coordinates', 'cache', serialize($coords), CACHE_PERMANENT);
+  cache_set('avatar_gallery_coordinates', serialize($coords), CACHE_PERMANENT);
 }
 
 ?>