Index: hovertip.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/hovertip/hovertip.module,v
retrieving revision 1.3
diff -u -r1.3 hovertip.module
--- hovertip.module	12 Dec 2007 19:23:34 -0000	1.3
+++ hovertip.module	25 Feb 2008 20:02:16 -0000
@@ -15,7 +15,7 @@
 function _hovertip_get_javascript() {
   $default =<<<END
 
-    // initialize tooltips in a seperate thread
+    // initialize tooltips in a separate thread
     $(document).ready(function() {
       window.setTimeout(hovertipInit, 1);
     });
@@ -27,37 +27,31 @@
 /**
  * Implementation of hook_menu in which we declare the settings hook.
  */
-function hovertip_menu($may_cache) {
+function hovertip_menu() {
   $items = array();
-  if ($may_cache) {
-    $items[] = array('path' => 'admin/settings/hovertip',
-                     'title' => t('Hovertip settings'),
-                     'description' => t('Configure the hovertip module'),
-                     'callback' => 'drupal_get_form',
-                     'callback arguments' => 'hovertip_settings_form',
-                     'access' => user_access('administer site configuration'),
-                     'type' => MENU_NORMAL_ITEM,
+  $items['admin/settings/hovertip'] = array(
+    'title' => 'Hovertip settings',
+    'description' => 'Configure the hovertip module',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('hovertip_settings_form'),
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_NORMAL_ITEM,
     );
-  }
-  else {
-    // Call our init hook.  See http://api.drupal.org/api/5/function/hook_init
-    _hovertip_init();
     
-    $items[] = array('path' => 'hovertip/settings_js',
-                     'callback' => 'hovertip_settings_js',
-                     'access' => TRUE,
-                     'type' => MENU_CALLBACK);
-  }
+  $items['hovertip/settings_js'] = array(
+    'page callback' => 'hovertip_settings_js',
+    'access arguments' => array(TRUE),
+    'type' => MENU_CALLBACK);
+
   return $items;
 }
 
-function hovertip_settings_form() {
-  
-  $form['hovertip_javascript'] =
-    array('#type' => 'textarea',
-          '#title' => t('Javascript to initialize hovertips'),
-          '#description' => t('The script here will be included in every page.'),
-          '#default_value' => _hovertip_get_javascript(),
+function hovertip_settings_form() {  
+  $form['hovertip_javascript'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Javascript to initialize hovertips'),
+    '#description' => t('The script here will be included in every page.'),
+    '#default_value' => _hovertip_get_javascript(),
     );
   return system_settings_form($form);
 }
@@ -68,10 +62,10 @@
  * reliably call drupal_add_css or drupal_add_js from that function.  So
  * instead we call this function from hook_menu.
  */
-function _hovertip_init() {
-  drupal_add_css(drupal_get_path('module', 'hovertip').'/hovertip.css');
-  drupal_add_js(drupal_get_path('module', 'hovertip') . '/hovertip.js');
-  drupal_add_js('?q=hovertip/settings_js');
+function hovertip_init() {
+  drupal_add_css(drupal_get_path('module', 'hovertip') .'/hovertip.css');
+  drupal_add_js(drupal_get_path('module', 'hovertip') .'/hovertip.js');
+  drupal_add_js('hovertip/settings_js');
 }
 
 function hovertip_settings_js() {
@@ -79,5 +73,3 @@
   print(_hovertip_get_javascript());
   return;
 }
-
-?>
\ No newline at end of file
Index: hovertip.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/hovertip/hovertip.info,v
retrieving revision 1.1
diff -u -r1.1 hovertip.info
--- hovertip.info	15 Jan 2007 02:29:58 -0000	1.1
+++ hovertip.info	22 Feb 2008 22:56:14 -0000
@@ -1,2 +1,3 @@
 name = Hovertip
 description = Support for tooltips, via the jquery hovertip plugin.
+core = 6.x