Index: scanner.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/scanner/scanner.module,v
retrieving revision 1.4
diff -u -r1.4 scanner.module
--- scanner.module	4 Dec 2008 01:17:52 -0000	1.4
+++ scanner.module	9 Feb 2009 19:16:33 -0000
@@ -57,63 +57,52 @@
 /**
  * Implementation of hook_menu().
  */
-function scanner_menu($may_cache) {
-  global $user;
-  $items = array();
+function scanner_menu() {
 
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/content/scanner',
-      'title' => t('Search and Replace Scanner'),
-      'callback' => 'scanner_view',
-      'access' => user_access('perform search and replace'),
+    $items['admin/content/scanner'] = array(
+      'title' => 'Search and Replace Scanner',
+      'page callback' => 'scanner_view',
+      'access arguments' => array('perform search and replace'),
     );
-    $items[] = array(
-      'path' => 'admin/content/scanner/scan',
-      'title' => t('Search'),
-      'access' => user_access('perform search and replace'),
+    $items['admin/content/scanner/scan'] = array(
+      'title' => 'Search',
+      'access arguments' => array('perform search and replace'),
       'type' => MENU_DEFAULT_LOCAL_TASK,
     );
-    $items[] = array(
-      'path' => 'admin/content/scanner/scan/confirm',
-      'title' => t('Confirm Replace'),
-      'access' => user_access('perform search and replace'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('scanner_confirm_form'),
+    $items['admin/content/scanner/scan/confirm'] = array(
+      'title' => 'Confirm Replace',
+      'access arguments' => array('perform search and replace'),
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('scanner_confirm_form'),
       'type' => MENU_CALLBACK,
     );
-    $items[] = array(
-      'path' => 'admin/content/scanner/undo/confirm',
-      'title' => t('Confirm Undo'),
-      'access' => user_access('perform search and replace'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('scanner_undo_confirm_form'),
+    $items['admin/content/scanner/undo/confirm'] = array(
+      'title' => 'Confirm Undo',
+      'access arguments' => array('perform search and replace'),
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('scanner_undo_confirm_form'),
       'type' => MENU_CALLBACK,
     );
-    $items[] = array( // Shows up on scanner page as tab.
-      'path' => 'admin/content/scanner/settings',
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('scanner_admin_form'),
-      'access' => user_access('administer scanner settings'),
+    $items['admin/content/scanner/settings'] = array( // Shows up on scanner page as tab.
+      'title' => 'Settings',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('scanner_admin_form'),
+      'access arguments' => array('administer scanner settings'),
       'type' => MENU_LOCAL_TASK,
-      'title' => t('Settings'),
       'weight' => 1,
     );
-    $items[] = array( // Shows up on scanner page as tab.
-      'path' => 'admin/content/scanner/undo',
-      'callback' => 'scanner_undo_page',
-      'access' => user_access('perform search and replace'),
+    $items['admin/content/scanner/undo'] = array( // Shows up on scanner page as tab.
+      'title' => 'Undo',
+      'page callback' => 'scanner_undo_page',
+      'access arguments' => array('perform search and replace'),
       'type' => MENU_LOCAL_TASK,
-      'title' => t('Undo'),
     );
-    $items[] = array( // Shows up on admin page.
-      'path' => 'admin/settings/scanner',
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('scanner_admin_form'),
-      'access' => user_access('administer scanner settings'),
-      'title' => t('Search and Replace Scanner'),
+    $items['admin/settings/scanner'] = array( // Shows up on admin page.
+      'title' => 'Search and Replace Scanner',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('scanner_admin_form'),
+      'access arguments' => array('administer scanner settings'),
     );
-  }
   return $items;
 }