undefined function: _content_fields in content_admin.inc

someone threw it out from CCK 4.7up to CVS.
I also use somepatches that need _content_fields.

In the meantime, add the following function to the end of
modules/cck/content.module

/**
* Return a list of all fields.
*
* @param $reset
*  If TRUE, clear the cache and fetch the information from the database again.
*/
function _content_fields($reset = FALSE) {
  static $fields;

  if ($reset || !isset($fields)) {
    $fields = array();
    $field_result = db_query('SELECT * FROM {node_field} nf');
    while ($field = db_fetch_array($field_result)) {
      $global_settings = $field['global_settings'] ? unserialize($field['global_settings']) : array();
      unset($field['global_settings']);
      $field = array_merge($field, $global_settings);
      $instance_info = db_fetch_array(db_query("SELECT type_name, label FROM {node_field_instance} WHERE field_name = '%s'", $field['field_name']));
      $field['widget']['label'] = $instance_info['label'];
      $field['type_name'] = $instance_info['type_name'];
      $fields[$field['field_name']] = $field;
    }
  }

  return $fields;
}

The function _content_fields was renamed content_fields in cvs, so 4.7 version of the content module uses _content_fields and the cvs version uses content_fields. Most of the patches flying around are still using _content_fields. The better patch would be to change cvs modules and patches to use the new function name.