3 files changed, 4 insertions, 4 deletions
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index d5c1d650b..0fa5aeea3 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -902,7 +902,7 @@ function hook_mail($key, &$message, $params) {
     $variables += array(
       '%uid' => $node->uid,
       '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
-      '%node_type' => node_get_types('name', $node),
+      '%node_type' => node_type_get_name($node),
       '%title' => $node->title,
       '%teaser' => $node->teaser,
       '%body' => $node->body,
diff --git a/modules/system/system.install b/modules/system/system.install
index 5d952a911..8f856e1d7 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3306,7 +3306,7 @@ function system_update_7016() {
  */
 function system_update_7017() {
   $ret = array();
-  $types = node_get_types();
+  $types = node_type_get_types();
   if (count($types)) {
     foreach ($types as $type) {
       $node_info = theme_get_setting('toggle_node_info_' . $type->type);
diff --git a/modules/system/system.module b/modules/system/system.module
index 2b11c003d..6db8db9dc 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -2158,7 +2158,7 @@ function system_mail($key, &$message, $params) {
     $variables += array(
       '%uid' => $node->uid,
       '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
-      '%node_type' => node_get_types('name', $node),
+      '%node_type' => node_type_get_name($node),
       '%title' => $node->title,
       '%teaser' => $node->teaser,
       '%body' => $node->body,
@@ -2232,7 +2232,7 @@ function system_message_action(&$object, $context = array()) {
     $variables = array_merge($variables, array(
       '%uid' => $node->uid,
       '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
-      '%node_type' => check_plain(node_get_types('name', $node)),
+      '%node_type' => check_plain(node_type_get_name($node)),
       '%title' => filter_xss($node->title),
       '%teaser' => filter_xss($node->teaser),
       '%body' => filter_xss($node->body),