diff -urp bbcode_wysiwyg/bbcode_wysiwyg.info bbcode_wysiwyg_new/bbcode_wysiwyg.info
--- bbcode_wysiwyg/bbcode_wysiwyg.info	2008-01-02 00:01:05.000000000 +0000
+++ bbcode_wysiwyg_new/bbcode_wysiwyg.info	2008-02-25 16:17:13.491713800 +0000
@@ -1,14 +1,6 @@
-; $Id: bbcode_wysiwyg.info,v 1.1.4.1 2007/11/09 09:06:36 jrbeeman Exp $
+; $Id$
 name = BBCode Formatting Bar
 description = Adds several buttons that allow users to enter bbcode in a wysiwyg type fashion.
-
-; Information added by drupal.org packaging script on 2007-02-02
-version = "5.x-1.0"
-project = "bbcode_wysiwyg"
-
-
-; Information added by drupal.org packaging script on 2008-01-02
-version = "5.x-2.x-dev"
-project = "bbcode_wysiwyg"
-datestamp = "1199232065"
+core = 6.x
+project = bbcode_wysiwyg
 
diff -urp bbcode_wysiwyg/bbcode_wysiwyg.module bbcode_wysiwyg_new/bbcode_wysiwyg.module
--- bbcode_wysiwyg/bbcode_wysiwyg.module	2008-01-01 17:56:15.000000000 +0000
+++ bbcode_wysiwyg_new/bbcode_wysiwyg.module	2008-02-25 16:20:01.603313800 +0000
@@ -5,27 +5,22 @@
  * Implementation of hook_perm().
  */
 function bbcode_wysiwyg_perm() {
-  return array(
-    'access bbcode formatting bar',
-  );
+  return array('access bbcode formatting bar');
 }
 
 
 /**
  * Implementation of hook_menu().
  */
-function bbcode_wysiwyg_menu($may_cache) {
+function bbcode_wysiwyg_menu() {
   $items = array();
 
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/settings/bbcode_wysiwyg',
-      'title' => t('BBCode Formatting Bar'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => 'bbcode_wysiwyg_admin_settings',
+    $items['admin/settings/bbcode_wysiwyg'] = array(
+      'title' => 'BBCode Formatting Bar',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('bbcode_wysiwyg_admin_settings'),
       'type' => MENU_NORMAL_ITEM
     );
-  }
 
   return $items;
 }
@@ -84,9 +79,9 @@ function bbcode_wysiwyg_admin_settings()
  */
 function bbcode_wysiwyg_js_settings($is_node, $element) {
   $buttons = variable_get('bbcode_wysiwyg_buttons_enabled', array());
-  $openTags = array();
-  foreach ($buttons as $key=>$value) {
-    $openTags[$key] = false;
+  $open_tags = array();
+  foreach ($buttons as $key => $value) {
+    $open_tags[$key] = false;
   }
   return array(
     'bbcode_wysiwyg' => array(
@@ -95,7 +90,7 @@ function bbcode_wysiwyg_js_settings($is_
       'isNode' => $is_node,
       'attachTo' => $element,
       'buttons' => $buttons,
-      'openTags' => $openTags,
+      'openTags' => $open_tags,
       'keydown_ctrl' => false,
       'keydown_shift' => false,
     ),
@@ -106,8 +101,8 @@ function bbcode_wysiwyg_js_settings($is_
 /**
  * Quick method for adding necessary bbcode javascript and css from any method
  */
-function bbcode_wysiwyg_add($is_node, $attachTo) {
-  drupal_add_js(bbcode_wysiwyg_js_settings($is_node, $attachTo), 'setting');
+function bbcode_wysiwyg_add($is_node, $attach_to) {
+  drupal_add_js(bbcode_wysiwyg_js_settings($is_node, $attach_to), 'setting');
   drupal_add_js(drupal_get_path('module', 'bbcode_wysiwyg') .'/bbcode_wysiwyg.js');
   drupal_add_css(drupal_get_path('module', 'bbcode_wysiwyg') .'/bbcode_wysiwyg.css');
 }
@@ -116,25 +111,25 @@ function bbcode_wysiwyg_add($is_node, $a
 /**
  * Implementation of hook_form_alter
  */
-function bbcode_wysiwyg_form_alter($form_id, &$form) {
+function bbcode_wysiwyg_form_alter(&$form, &$form_state, $form_id) {
   $show = false;
   $is_node = false;
-  $attachTo = '';
+  $attach_to = '';
   $other_forms = variable_get('bbcode_wysiwyg_other_forms', array());
   $node_forms = variable_get('bbcode_wysiwyg_node_forms', array());
   
   if ($form['#id'] == 'node-form' && $node_forms[$form['type']['#value']]) {
     $show = true;
     $is_node = true;
-    $attachTo = 'edit-body';
+    $attach_to = 'edit-body';
   }
   else if ($other_forms[$form_id]) {
     $show = true;
-    $attachTo = 'edit-comment';
+    $attach_to = 'edit-comment';
   }
   
   if ($show && user_access('access bbcode formatting bar')) {
-    bbcode_wysiwyg_add($is_node, $attachTo);
+    bbcode_wysiwyg_add($is_node, $attach_to);
   }
 }
 
@@ -251,4 +246,4 @@ function _bbcode_wysiwyg_form($is_story)
   }
   return $form;
 }
-?>
+