summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--feeds.module2
-rw-r--r--feeds.pages.inc2
-rw-r--r--feeds_ui/feeds_ui.admin.inc6
-rw-r--r--plugins/FeedsFeedNodeProcessor.inc2
-rw-r--r--plugins/FeedsNodeProcessor.inc4
5 files changed, 8 insertions, 8 deletions
diff --git a/feeds.module b/feeds.module
index d80dd7e..9c80a2d 100644
--- a/feeds.module
+++ b/feeds.module
@@ -617,7 +617,7 @@ function feeds_cache_clear($rebuild_menu = TRUE) {
ctools_static_reset('_feeds_importer_digest');
ctools_include('export');
ctools_export_load_object_reset('feeds_importer');
- node_get_types('types', NULL, TRUE);
+ drupal_static_reset('_node_types_build');
if ($rebuild_menu) {
menu_rebuild();
}
diff --git a/feeds.pages.inc b/feeds.pages.inc
index 340aac6..a0ed269 100644
--- a/feeds.pages.inc
+++ b/feeds.pages.inc
@@ -25,7 +25,7 @@ function feeds_page() {
}
elseif (user_access('create '. $importer->config['content_type'] .' content')) {
$link = 'node/add/'. str_replace('_', '-', $importer->config['content_type']);
- $title = node_get_types('name', $importer->config['content_type']);
+ $title = node_types_get('name', $importer->config['content_type']);
}
$rows[] = array(
l($title, $link),
diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index d9e5f4d..3792ccf 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -69,10 +69,10 @@ function feeds_ui_overview_form(&$form_status) {
}
else {
if (!$importer->disabled) {
- $importer_form['attached']['#value'] = l(node_get_types('name', $importer->config['content_type']), 'node/add/'. str_replace('_', '-', $importer->config['content_type']));
+ $importer_form['attached']['#value'] = l(node_type_get_name($importer->config['content_type']), 'node/add/'. str_replace('_', '-', $importer->config['content_type']));
}
else {
- $importer_form['attached']['#value'] = node_get_types('name', $importer->config['content_type']);
+ $importer_form['attached']['#value'] = node_type_get_name($importer->config['content_type']);
}
}
@@ -320,7 +320,7 @@ function feeds_ui_edit_page($importer, $active = 'help', $plugin_key = '') {
// Basic information.
$items = array();
- $items[] = t('Attached to: !type', array('!type' => $importer->config['content_type'] ? node_get_types('name', $importer->config['content_type']) : t('[none]')));
+ $items[] = t('Attached to: @type', array('@type' => $importer->config['content_type'] ? node_type_get_name($importer->config['content_type']) : t('[none]')));
if ($importer->config['import_period'] == FEEDS_SCHEDULE_NEVER) {
$import_period = t('never');
}
diff --git a/plugins/FeedsFeedNodeProcessor.inc b/plugins/FeedsFeedNodeProcessor.inc
index 9429ece..193ae65 100644
--- a/plugins/FeedsFeedNodeProcessor.inc
+++ b/plugins/FeedsFeedNodeProcessor.inc
@@ -116,7 +116,7 @@ class FeedsFeedNodeProcessor extends FeedsProcessor {
$types = array();
foreach ($feeds as $feed) {
if ($feed->id != $this->id && !empty($feed->config['content_type'])) {
- $types[$feed->config['content_type']] = node_get_types('name', $feed->config['content_type']);
+ $types[$feed->config['content_type']] = check_plain(node_type_get_name($feed->config['content_type']));
}
}
if (empty($types)) {
diff --git a/plugins/FeedsNodeProcessor.inc b/plugins/FeedsNodeProcessor.inc
index 7fd7947..52c5f24 100644
--- a/plugins/FeedsNodeProcessor.inc
+++ b/plugins/FeedsNodeProcessor.inc
@@ -70,10 +70,10 @@ class FeedsNodeProcessor extends FeedsProcessor {
// Set messages.
if ($batch->created) {
- drupal_set_message(format_plural($batch->created, 'Created @number @type node.', 'Created @number @type nodes.', array('@number' => $batch->created, '@type' => node_get_types('name', $this->config['content_type']))));
+ drupal_set_message(format_plural($batch->created, 'Created @number @type node.', 'Created @number @type nodes.', array('@number' => $batch->created, '@type' => node_type_get_name($this->config['content_type']))));
}
elseif ($batch->updated) {
- drupal_set_message(format_plural($batch->updated, 'Updated @number @type node.', 'Updated @number @type nodes.', array('@number' => $batch->updated, '@type' => node_get_types('name', $this->config['content_type']))));
+ drupal_set_message(format_plural($batch->updated, 'Updated @number @type node.', 'Updated @number @type nodes.', array('@number' => $batch->updated, '@type' => node_type_get_name($this->config['content_type']))));
}
else {
drupal_set_message(t('There is no new content.'));