Index: avatar_gallery.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/avatar_gallery/avatar_gallery.info,v
retrieving revision 1.1
diff -u -r1.1 avatar_gallery.info
--- avatar_gallery.info	29 Dec 2006 22:15:55 -0000	1.1
+++ avatar_gallery.info	14 Jun 2009 00:33:09 -0000
@@ -1,3 +1,4 @@
-; $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."
+; $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."
+core = 6.x
\ No newline at end of file
Index: avatar_gallery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/avatar_gallery/avatar_gallery.module,v
retrieving revision 1.7
diff -u -r1.7 avatar_gallery.module
--- avatar_gallery.module	22 May 2008 20:38:29 -0000	1.7
+++ avatar_gallery.module	14 Jun 2009 00:58:49 -0000
@@ -6,34 +6,31 @@
  *
  * @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 arguments' => array('administer site configuration'),
+  $items['admin/settings/avatar_gallery/settings'] = array(
+    'title' => 'Settings',
+    'description' => 'Configure images and text.',
+    '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 arguments' => array('administer site configuration'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 1,
+  );
+
   return $items;
 }
 
@@ -41,7 +38,6 @@
  * Implementation of hook_block().
  */
 function avatar_gallery_block($op = 'list', $delta = 0) {
-  $menu = menu_get_menu();
 
   if ($op == 'list') {
     $blocks[]=array("info"=>t("Avatar gallery"));
@@ -109,9 +105,9 @@
   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";
 }
 
 /**
@@ -582,7 +578,7 @@
   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', CACHE_PERMANENT);
 }
 
 ?>