Index: filefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v
retrieving revision 1.10
diff -u -r1.10 filefield.module
--- filefield.module	6 Sep 2006 23:55:49 -0000	1.10
+++ filefield.module	21 Sep 2006 18:31:55 -0000
@@ -16,16 +16,6 @@
   //drupal_set_message('POST: <pre>'. print_r($_POST, true) .'</pre>');
 }
 
-/**
- * Implementation of hook_help().
- */
-function filefield_help($section) {
-  switch ($section) {
-    case 'admin/modules#description':
-      return t('Defines a file  field type for content.module.');
-  }
-}
-
 function filefield_menu($maycache) {
   $items = array();
 
@@ -77,7 +67,7 @@
  */
 function filefield_field_info() {
   return array(
-    'file' => array('label' => 'file'),
+    'file' => array('label' => 'File'),
   );
 }
 
@@ -301,7 +291,7 @@
       }
 
       // Attach new files 
-      if ($file = file_check_upload($fieldname . '_upload')) {
+      if ($file = file_check_upload($fieldname . '_file_upload')) {
         //drupal_set_message('file found!!!');
         $file = (array)$file;
         $ext = array_pop(explode('.',$file['filename']));
@@ -310,7 +300,8 @@
           //do mime specific handling.
         }
         else {
-          form_set_error($field['field_name'] .'_upload',t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => theme('placeholder',$ext), '%allowed_extensions' => theme('placeholder', $field['widget']['file_extensions']))));
+          form_set_error($field['field_name'] .'_file_upload',t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => $ext, '%allowed_extensions' => $field['widget']['file_extensions'])));
+
           return FALSE;
         }
         $file['fid'] = 'upload';
@@ -368,7 +359,7 @@
 
 function _filefield_widget_form($node, $field, &$node_field) {
   $fieldname = $field['field_name'];
-  theme_add_style(drupal_get_path('module', 'filefield') .'/filefield.css');
+  drupal_add_css(drupal_get_path('module', 'filefield') .'/filefield.css');
  
   $form = array(); 
   $form[$fieldname] = array(
@@ -381,9 +372,9 @@
     '#theme' => 'filefield_current',
   );
   
-  $form[$fieldname][$fieldname .'_upload'] = array(
+  $form[$fieldname][$fieldname .'_file_upload'] = array(
     '#type'  => 'file',
-    '#description' => t('Attach a file. allowed extensions(%ext)', array('%ext' => theme('placeholder', $field['widget']['file_extensions']))),
+    '#description' => t('Attach a file. allowed extensions(%ext)', array('%ext' => $field['widget']['file_extensions'])),
     '#weight' => 9,
     '#tree' => FALSE,
   );
@@ -453,18 +444,18 @@
     //numeric key == $delta
     if (is_numeric($key)) {
       $row = array();
-      $row[] = form_render($form[$key]['icon']);
-      $row[] = form_render($form[$key]['description']);
-      $row[] = form_render($form[$key]['size']);
-      $row[] = form_render($form[$key]['list']);
-      $row[] = form_render($form[$key]['remove']);
+      $row[] = drupal_render($form[$key]['icon']);
+      $row[] = drupal_render($form[$key]['description']);
+      $row[] = drupal_render($form[$key]['size']);
+      $row[] = drupal_render($form[$key]['list']);
+      $row[] = drupal_render($form[$key]['remove']);
       $rows[] = $row;
     }
   }
   if (count($rows)) {
     $output = theme('table', $header, $rows);
   }
-  $output .= form_render($form);
+  $output .= drupal_render($form);
   return $output;
 }
 
--- D:/drupal/drupal_head/sites/all/modules/filefield/filefield.info
+++ D:/drupal/drupal_head/sites/all/modules/filefield/filefield.info
@@ -0,0 +1,3 @@
+; $Id:$
+name = File Field
+description = Defines a file field type for CCK nodes. <em>Note: Requires content.module.</em>