Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/README.txt,v
retrieving revision 1.5.2.3
diff -u -p -r1.5.2.3 README.txt
--- README.txt	17 May 2009 20:09:03 -0000	1.5.2.3
+++ README.txt	19 May 2009 22:04:39 -0000
@@ -10,7 +10,6 @@ Features
     * Disable the expand/collapse of the selection fieldset.
     * Set selection fieldset title.
     * Set default formats for nodes, comments, and blocks separately.
-    * Works with CCK textareas.
     * Panels comment support.
     * I18n module support.
     * and more.
Index: better-formats-defaults-admin-form.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/better-formats-defaults-admin-form.tpl.php,v
retrieving revision 1.3.2.3
diff -u -p -r1.3.2.3 better-formats-defaults-admin-form.tpl.php
--- better-formats-defaults-admin-form.tpl.php	17 May 2009 20:09:03 -0000	1.3.2.3
+++ better-formats-defaults-admin-form.tpl.php	19 May 2009 20:59:42 -0000
@@ -18,9 +18,9 @@
 ?>
 <?php
   // Add table javascript
-  drupal_add_tabledrag('node-format-defaults', 'order', 'sibling', 'better-formats-role-node-weight');
-  drupal_add_tabledrag('comment-format-defaults', 'order', 'sibling', 'better-formats-role-comment-weight');
-  drupal_add_tabledrag('block-format-defaults', 'order', 'sibling', 'better-formats-role-block-weight');
+  // drupal_add_tabledrag('node-format-defaults', 'order', 'sibling', 'better-formats-role-node-weight');
+  // drupal_add_tabledrag('comment-format-defaults', 'order', 'sibling', 'better-formats-role-comment-weight');
+  // drupal_add_tabledrag('block-format-defaults', 'order', 'sibling', 'better-formats-role-block-weight');
 ?>
 <div class="description"><?php print t('Only formats that a role has permission to use are shown.'); ?></div>
 <fieldset>
Index: better_formats.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/better_formats.info,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 better_formats.info
--- better_formats.info	25 Feb 2009 06:44:17 -0000	1.1.2.2
+++ better_formats.info	19 May 2009 20:45:45 -0000
@@ -1,4 +1,4 @@
 ; $Id: better_formats.info,v 1.1.2.2 2009/02/25 06:44:17 dragonwize Exp $
 name = Better Formats
 description = Enhances the core input format system by managing input format defaults and settings.
-core = 6.x
+dependencies = jquery_update
Index: better_formats.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/better_formats.install,v
retrieving revision 1.7.2.5
diff -u -p -r1.7.2.5 better_formats.install
--- better_formats.install	17 May 2009 20:09:03 -0000	1.7.2.5
+++ better_formats.install	19 May 2009 21:09:42 -0000
@@ -11,55 +11,25 @@
 
 
 /**
- * Implementation of hook_schema().
- */
-function better_formats_schema() {
-  $schema['better_formats_defaults'] = array(
-    'fields' => array(
-      'rid' => array(
-        'type'     => 'int',
-        'size'     => 'normal',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'type' => array(
-        'type'     => 'varchar',
-        'length'   => 255,
-        'not null' => TRUE,
-      ),
-      'format' => array(
-        'type' => 'int',
-        'size' => 'medium',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'type_weight' => array(
-        'type'     => 'int',
-        'size'     => 'tiny',
-        'default'  => 0,
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'weight' => array(
-        'type'     => 'int',
-        'size'     => 'tiny',
-        'default'  => 0,
-        'unsigned' => FALSE,
-        'not null' => TRUE,
-      ),
-    ),
-    'primary key' => array('rid', 'type'),
-  );
-
-  return $schema;
-}
-
-/**
  * Implementation of hook_install().
  */
 function better_formats_install() {
   // Create tables.
-  drupal_install_schema('better_formats');
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("
+        CREATE TABLE {better_formats_defaults} (
+          rid int unsigned NOT NULL default 0,
+          type varchar(255) NOT NULL default '',
+          format int unsigned NOT NULL default 0,
+          type_weight tinyint NOT NULL default 0,
+          weight tinyint NOT NULL default 0,
+          PRIMARY KEY (rid, type)
+        ) /*!40100 DEFAULT CHARACTER SET utf8 */;"
+      );
+      break;
+  }
 
   // Increase module weight to prevent compatibility issues.
   $sql = "UPDATE {system}
@@ -95,8 +65,8 @@ function better_formats_install() {
     foreach ($role_perms as $perms) {
       $sql = "UPDATE {permission}
               SET perm = '%s'
-              WHERE pid = %d";
-      db_query($sql, $perms->perm . $default_perms, $perms->pid);
+              WHERE rid = %d";
+      db_query($sql, $perms->perm . $default_perms, $perms->rid);
     }
     // Clear the cached pages
     cache_clear_all();
@@ -108,7 +78,7 @@ function better_formats_install() {
  */
 function better_formats_uninstall() {
   // Remove tables.
-  drupal_uninstall_schema('better_formats');
+  db_query("DROP TABLE {better_formats_defaults}");
 
   // Delete settings from varible table.
   $sql = "DELETE FROM {variable}
Index: better_formats.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/better_formats.module,v
retrieving revision 1.23.2.11
diff -u -p -r1.23.2.11 better_formats.module
--- better_formats.module	17 May 2009 20:09:03 -0000	1.23.2.11
+++ better_formats.module	19 May 2009 22:05:13 -0000
@@ -12,8 +12,8 @@
 /**
  * Implementation of hook_help().
  */
-function better_formats_help($path, $arg) {
-  switch ($path) {
+function better_formats_help($section) {
+  switch ($section) {
     case 'admin/help/better_formats':
       $output = '<p>' . t('See the module README.txt file in the better_formats module directory for help.') . '</p>';
       break;
@@ -45,53 +45,45 @@ function better_formats_perm() {
 /**
  * Implementation of hook_menu().
  */
-function better_formats_menu() {
-  $items   = array();
-
-  $items['admin/settings/filters/settings'] = array(
-    'title' => 'Settings',
-    'description' => 'Manage input formats',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('better_formats_settings_admin_form'),
-    'access arguments' => array('administer filters'),
+function better_formats_menu($may_cache) {
+  if (!$may_cache) {
+    if (strpos($_GET['q'], 'admin/settings/filters/settings') === 0) {
+      require_once drupal_get_path('module', 'better_formats') . '/better_formats_settings.admin.inc';
+    }
+    if (strpos($_GET['q'], 'admin/settings/filters/defaults') === 0) {
+      require_once drupal_get_path('module', 'better_formats') . '/better_formats_defaults.admin.inc';
+    }
+    return array();
+  }
+
+  $items[] = array(
+    'path' => 'admin/settings/filters/settings',
+    'title' => t('Settings'),
+    'description' => t('Manage input formats'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('better_formats_settings_admin_form'),
+    'access' => user_access('administer filters'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 3,
-    'file' => 'better_formats_settings.admin.inc',
   );
-  $items['admin/settings/filters/defaults'] = array(
-    'title' => 'Defaults',
-    'description' => 'Manage input formats',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('better_formats_defaults_admin_form'),
-    'access arguments' => array('administer filters'),
+  $items[] = array(
+    'path' => 'admin/settings/filters/defaults',
+    'title' => t('Defaults'),
+    'description' => t('Manage input formats'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('better_formats_defaults_admin_form'),
+    'access' => user_access('administer filters'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 2,
-    'file' => 'better_formats_defaults.admin.inc',
   );
 
   return $items;
 }
 
 /**
- * Implementation of hook_theme().
- */
-function better_formats_theme() {
-  return array(
-    'better_formats_defaults_admin_form' => array(
-      'template' => 'better-formats-defaults-admin-form',
-      'file' => 'better_formats_defaults.admin.inc',
-      'arguments' => array('form' => NULL),
-    ),
-    'better_formats_filter_tips_more_info' => array(
-      'arguments' => array(),
-    ),
-  );
-}
-
-/**
  * Implementation of hook_form_alter().
  */
-function better_formats_form_alter(&$form, $form_state, $form_id) {
+function better_formats_form_alter($form_id, &$form) {
   // Alter new node and comment forms.
   // Using $form['#id'] instead of $form_id because $form_id is in the form of
   // 'TYPE_node_form' which varies with the content type while $form['#id']
@@ -116,19 +108,19 @@ function better_formats_form_alter(&$for
   switch ($form_id) {
     case 'node_type_form':
       if (variable_get('better_formats_per_node_type', FALSE)) {
-        better_formats_node_type_form($form, $form_state);
+        better_formats_node_type_form($form);
       }
       break;
 
     case 'user_admin_new_role':
-      if (!in_array('better_formats_new_role', $form['#submit'])) {
-        $form['#submit'][] = 'better_formats_new_role';
+      if (!isset($form['#submit']['better_formats_new_role'])) {
+        $form['#submit']['better_formats_new_role'] = array($form);
       }
       break;
 
     case 'user_admin_role':
-      if (isset($form_state['post']['op']) && $form_state['post']['op'] == 'Delete role') {
-        $form['#submit'][] = 'better_formats_delete_role';
+      if (isset($_POST['op']) && $_POST['op'] == 'Delete role') {
+        $form['#submit']['better_formats_delete_role'] = array($form);
       }
       break;
   }
@@ -140,7 +132,7 @@ function better_formats_form_alter(&$for
  * @see better_formats_node_type_form_validate()
  * @see better_formats_node_type_form_submit()
  */
-function better_formats_node_type_form(&$form, $form_state) {
+function better_formats_node_type_form(&$form) {
   // Add JS to enhance form.
   drupal_add_js(drupal_get_path('module', 'better_formats') . '/better_formats_node_type_form.js');
 
@@ -178,15 +170,15 @@ function better_formats_node_type_form(&
     '#theme' => 'better_formats_defaults_admin_form',
   );
 
-  module_load_include('admin.inc', 'better_formats', 'better_formats_defaults');
+  require_once drupal_get_path('module', 'better_formats') . '/better_formats_defaults.admin.inc';
   $nform = better_formats_get_role_default_fields('node', $node_type);
   $cform = better_formats_get_role_default_fields('comment', $node_type);
 
   $form[$key]['better_formats_defaults'] = array_merge($dform, $nform, $cform);
 
   // Attach our validate and submit handlers.
-  $form['#validate'][] = 'better_formats_node_type_form_validate';
-  $form['#submit'][] = 'better_formats_node_type_form_submit';
+  $form['#validate']['better_formats_node_type_form_validate'] = array($form);
+  $form['#submit']['better_formats_node_type_form_submit'] = array($form);
 }
 
 /**
@@ -195,9 +187,9 @@ function better_formats_node_type_form(&
  * @see better_formats_node_type_form()
  * @see better_formats_node_type_form_submit()
  */
-function better_formats_node_type_form_validate($form, &$form_state) {
-  module_load_include('admin.inc', 'better_formats', 'better_formats_defaults');
-  better_formats_defaults_admin_form_validate($form, $form_state);
+function better_formats_node_type_form_validate($form_id, $form_values, $form) {
+  require_once drupal_get_path('module', 'better_formats') . '/better_formats_defaults.admin.inc';
+  better_formats_defaults_admin_form_validate($form_id, $form_values, $form);
 }
 
 /**
@@ -206,8 +198,8 @@ function better_formats_node_type_form_v
  * @see better_formats_node_type_form()
  * @see better_formats_node_type_form_validate()
  */
-function better_formats_node_type_form_submit($form, &$form_state) {
-  $node_type = trim($form_state['values']['type']);
+function better_formats_node_type_form_submit($form_id, $form_values, $form) {
+  $node_type = trim($form_values['type']);
 
   // Remove current db entries.
   $sql = "DELETE FROM {better_formats_defaults}
@@ -217,7 +209,7 @@ function better_formats_node_type_form_s
   // Insert defualt values into DB.
   $sql = "INSERT INTO {better_formats_defaults}
           VALUES (%d, '%s', %d, %d, %d)";
-  foreach ($form_state['values']['better_formats_defaults'] as $key => $values) {
+  foreach ($form_values['better_formats_defaults'] as $key => $values) {
     if (strpos($key, 'node-') === 0 || strpos($key, 'comment-') === 0) {
       list($type, $rid) = explode('-', $key);
       db_query($sql, $rid, $type . '/' . $node_type, $values['format'], 2, $values['weight']);
@@ -234,7 +226,7 @@ function better_formats_node_type_form_s
  *
  * @see better_formats_form_alter()
  */
-function better_formats_new_role($form, &$form_state) {
+function better_formats_new_role($form_id, $form_values, $form) {
   // Get the ID for the role just created.
   $sql = "SELECT rid
           FROM {role}
@@ -255,7 +247,7 @@ function better_formats_new_role($form, 
  *
  * @see better_formats_form_alter()
  */
-function better_formats_delete_role($form, &$form_state) {
+function better_formats_delete_role($form_id, $form_values, $form) {
   // Delete role from format manager table.
   $sql = "DELETE FROM {better_formats_defaults}
           WHERE rid = %d";
@@ -284,12 +276,9 @@ function better_formats_node_type($op, $
  */
 function better_formats_elements() {
   return array(
-    'text_textfield' => array(
-      '#process' => array('better_formats_text_process'),
-    ),
-    'text_textarea' => array(
-      '#process' => array('better_formats_text_process'),
-    ),
+//    'textarea' => array(
+//      '#process' => array('better_formats_text_process' => array()),
+//    ),
   );
 }
 
@@ -302,7 +291,10 @@ function better_formats_elements() {
  * @see text_textfield_process()
  * @see text_textarea_process()
  */
-function better_formats_text_process($element, $edit, $form_state, $form) {
+function better_formats_text_process($element, $edit) {
+  if (strpos($element['#name'], 'field_') === FALSE) {
+    return $element;
+  }
   $field = $form['#field_info'][$element['#field_name']];
 
   if (!empty($field['text_processing'])) {
@@ -313,7 +305,7 @@ function better_formats_text_process($el
     $default    = better_formats_get_default_format('node', $form['type']['#value']);
 
     // Overwrite format default if new node.
-    if (!isset($form_state['values']['nid']) || !isset($format)) {
+    if (!isset($form_values['nid']) || !isset($format)) {
       $format = $default;
     }
     $format = filter_resolve_format($format);
@@ -333,7 +325,7 @@ function better_formats_text_process($el
  */
 function better_formats_set_node_format(&$form) {
   // Set core body field.
-  if (isset($form['body_field'])) {
+  if (isset($form['body_filter'])) {
     // Get default for new entries.
     $default = better_formats_get_default_format('node', $form['type']['#value']);
 
@@ -343,11 +335,11 @@ function better_formats_set_node_format(
     }
     else {
       // Get existing format for core body field.
-      $format = better_formats_get_current_format($form['body_field']['format']);
+      $format = better_formats_get_current_format($form['body_filter']['format']);
     }
 
     // Overwrite the filter form with our own.
-    $form['body_field']['format'] = better_formats_filter_form($format, $default, $form['type']['#value']);
+    $form['body_filter']['format'] = better_formats_filter_form($format, $default, $form['type']['#value']);
   }
 }
 
Index: better_formats_defaults.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/better_formats/better_formats_defaults.admin.inc,v
retrieving revision 1.3.2.6
diff -u -p -r1.3.2.6 better_formats_defaults.admin.inc
--- better_formats_defaults.admin.inc	17 May 2009 20:09:03 -0000	1.3.2.6
+++ better_formats_defaults.admin.inc	19 May 2009 21:11:07 -0000
@@ -40,7 +40,7 @@ function better_formats_defaults_admin_f
  * @see better_formats_defaults_admin_form()
  * @see better_formats_defaults_admin_form_submit()
  */
-function better_formats_defaults_admin_form_validate($form, &$form_state) {
+function better_formats_defaults_admin_form_validate($form_id, $form_values) {
   $formats = filter_formats();
   foreach ($formats as $fid => $format) {
     $roles[$fid] = explode(',', $format->roles);
@@ -48,7 +48,7 @@ function better_formats_defaults_admin_f
   // Get roles that have administer filters permission.
   $admin_roles = better_formats_get_roles_by_perm('administer filters');
 
-  foreach ($form_state['values'] as $key => $values) {
+  foreach ($form_values as $key => $values) {
     if (strpos($key, 'node-') === 0 || strpos($key, 'comment-') === 0 || strpos($key, 'block-') === 0) {
       list($type, $rid) = explode('-', $key);
       if (in_array($rid, $admin_roles)) {
@@ -69,13 +69,13 @@ function better_formats_defaults_admin_f
  * @see better_formats_defaults_admin_form()
  * @see better_formats_defaults_admin_form_validate()
  */
-function better_formats_defaults_admin_form_submit($form, &$form_state) {
+function better_formats_defaults_admin_form_submit($form_id, $form_values) {
   // Update DB.
   $sql = "UPDATE {better_formats_defaults}
           SET format=%d, weight=%d
           WHERE rid=%d AND type='%s'";
 
-  foreach ($form_state['values'] as $key => $values) {
+  foreach ($form_values as $key => $values) {
     if (strpos($key, 'node-') === 0 || strpos($key, 'comment-') === 0 || strpos($key, 'block-') === 0) {
       list($type, $rid) = explode('-', $key);
       db_query($sql, $values['format'], $values['weight'], $rid, $type);
@@ -203,6 +203,17 @@ function better_formats_get_roles_by_per
 }
 
 /**
+ * D5 only; helper function for theming default input formats form.
+ */
+function theme_better_formats_defaults_admin_form(&$form) {
+  $variables = array(
+    'form' => $form,
+  );
+  template_preprocess_better_formats_defaults_admin_form($variables);
+  return _phptemplate_render(drupal_get_path('module', 'better_formats') . '/better-formats-defaults-admin-form.tpl.php', $variables);
+}
+
+/**
  * Process variables for better-defaults-admin-form.tpl.php.
  *
  * @param $variables