Index: compact_forms.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/compact_forms/compact_forms.info,v
retrieving revision 1.2
diff -u -p -r1.2 compact_forms.info
--- compact_forms.info	1 May 2009 23:10:11 -0000	1.2
+++ compact_forms.info	1 May 2009 23:15:22 -0000
@@ -2,3 +2,4 @@
 name = Compact Forms
 description = Overlays form fields with their respective labels using JavaScript.
 package = User interface
+core = 6.x
Index: compact_forms.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/compact_forms/compact_forms.module,v
retrieving revision 1.2
diff -u -p -r1.2 compact_forms.module
--- compact_forms.module	1 May 2009 23:10:11 -0000	1.2
+++ compact_forms.module	1 May 2009 23:20:37 -0000
@@ -26,7 +26,7 @@ function compact_forms_perm() {
 /**
  * Implementation of hook_form_alter().
  */
-function compact_forms_form_alter($form_id, &$form) {
+function compact_forms_form_alter(&$form, $form_state, $form_id) {
   static $ids;
 
   $field_size = variable_get('compact_forms_field_size', '');
@@ -78,28 +78,25 @@ function _compact_forms_resize_fields(&$
 /**
  * Implementation of hook_menu().
  */
-function compact_forms_menu($may_cache) {
+function compact_forms_menu() {
+  $items['admin/settings/compact_forms'] = array(
+    'title' => t('Compact Forms'),
+    'description' => t('Configure Compact Forms settings.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => 'compact_forms_admin_form',
+    'file' => 'compact_forms.admin.inc',
+    'access arguments' => array('administer Compact Forms'),
+  );
+}
+
+/**
+ * Implementation of hook_init().
+ */
+function compact_forms_init() {
   global $user;
 
-  $items = array();
-  if ($may_cache) {
-    $items[] = array(
-      'title' => t('Compact Forms'),
-      'path' => 'admin/settings/compact_forms',
-      'description' => t('Makes form fields compact by overlaying the field label on top the field itself using jQuery.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'compact_forms_admin_form',
-      'access' => user_access('administer Compact Forms'),
-    );
-  }
-  else {
-    if (strpos($_GET['q'], 'admin/settings/compact_forms') === 0) {
-      require_once drupal_get_path('module', 'compact_forms') . '/compact_forms.admin.inc';
-    }
-    // Load our behavior.
-    _compact_forms_include_js();
-  }
-  return $items;
+  // Load our behavior.
+  _compact_forms_include_js();
 }
 
 /**
