diff --git a/cck.module b/cck.module index 8f9a25e..855a51a 100644 --- a/cck.module +++ b/cck.module @@ -286,7 +286,7 @@ function cck_field_set_setting($setting, $setting_type, $value, $field, $instanc function cck_default_value_php($entity_type, $entity, $field, $instance, $langcode = LANGUAGE_NONE) { $default_value = array(); ob_start(); - $result = eval(cck_field_get_setting('default_value_php', 'instance', $field, $instance, $langcode, $flatten = TRUE)); + $result = eval(cck_field_get_setting('default_value_php', 'instance', $field, $instance, $langcode)); ob_end_clean(); if (is_array($result)) { $default_value = $result; diff --git a/modules/content_migrate/content_migrate.module b/modules/content_migrate/content_migrate.module index aa6a17b..ce5783a 100644 --- a/modules/content_migrate/content_migrate.module +++ b/modules/content_migrate/content_migrate.module @@ -155,7 +155,7 @@ function content_migrate_new_columns($field) { } else { // There is only one table in this array, but the columns for all tables are the same so it doesn't matter. - foreach ($field['storage']['details']['sql'][FIELD_LOAD_CURRENT] as $table => $columns) { + foreach ($field['storage']['details']['sql'][FIELD_LOAD_CURRENT] as $columns) { return $columns; } } diff --git a/modules/content_migrate/includes/content_migrate.admin.inc b/modules/content_migrate/includes/content_migrate.admin.inc index a2ac7e8..df83383 100644 --- a/modules/content_migrate/includes/content_migrate.admin.inc +++ b/modules/content_migrate/includes/content_migrate.admin.inc @@ -56,7 +56,6 @@ function content_migrate_get_options() { unset($instance_values[$bundle]['messages']); } $bundles[] = $type_names[$bundle]; - $label = $instance_value['label']; } $data = array( 0 => $field_name, @@ -223,9 +222,6 @@ function _content_migrate_batch_process_create_fields($field_name, &$context) { $messages = array(); $errors = array(); $type_names = node_type_get_names(); - $allowed_fields = field_info_field_types(); - $allowed_widgets = field_info_widget_types(); - $allowed_formatters = field_info_formatter_types(); $context['message'] = t('"Creating field: %field', array('%field' => $field_name)); $field_value = content_migrate_get_field_values($field_name); diff --git a/modules/content_migrate/includes/content_migrate.drush.inc b/modules/content_migrate/includes/content_migrate.drush.inc index e588240..be01d68 100644 --- a/modules/content_migrate/includes/content_migrate.drush.inc +++ b/modules/content_migrate/includes/content_migrate.drush.inc @@ -70,7 +70,7 @@ function drush_content_migrate_status() { $rows = array(); $rows[] = array(t('Status'), t('Field'), t('Field type'), t('Content type(s)'), t('Other information')); foreach ($fields_info as $status => $fields) { - foreach ($fields as $field_name => $field) { + foreach ($fields as $field) { array_unshift($field, t(ucfirst($status))); $rows[] = $field; } diff --git a/modules/content_migrate/includes/content_migrate.values.inc b/modules/content_migrate/includes/content_migrate.values.inc index 506b1e4..c4bfbda 100644 --- a/modules/content_migrate/includes/content_migrate.values.inc +++ b/modules/content_migrate/includes/content_migrate.values.inc @@ -114,7 +114,6 @@ function _content_migrate_get_instance_values($bundle = NULL, $field_name = NULL if (empty($instance_values) && db_table_exists('content_node_field_instance')) { - $allowed_fields = field_info_field_types(); $allowed_widgets = field_info_widget_types(); $allowed_formatters = field_info_formatter_types();