Index: filefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v
retrieving revision 1.162
diff -u -F^f -r1.162 filefield.module
--- filefield.module	4 Feb 2009 03:04:25 -0000	1.162
+++ filefield.module	10 Feb 2009 22:14:50 -0000
@@ -498,7 +498,9 @@ function filefield_js($type_name, $field
   // AHAH behaviours after replacing the element. So we need to tell it first.
   $javascript = drupal_add_js(NULL, NULL);
   if (isset($javascript['setting'])) {
-    $output .= '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js(call_user_func_array('array_merge_recursive', $javascript['setting'])) .');</script>';
+    $settings = call_user_func_array('array_merge_recursive', $javascript['setting']);
+    $ahah_settings = array('ahah' => $settings['ahah']);
+    $output .= '<script type="text/javascript">jQuery.extend(Drupal.settings, '. drupal_to_js($ahah_settings) .');</script>';
   }
 
   // For some reason, file uploads don't like drupal_json() with its manual