' . t('The revisions let you track differences between multiple versions of a post.') . '
'; case 'node/%/edit': $node = node_load($arg[1]); - $type = node_get_types('type', $node->type); + $type = node_get_type($node); return (!empty($type->help) ? '' . filter_xss_admin($type->help) . '
' : ''); } if ($arg[0] == 'node' && $arg[1] == 'add' && $arg[2]) { - $type = node_get_types('type', str_replace('-', '_', $arg[2])); + $type = node_get_type(str_replace('-', '_', $arg[2])); return (!empty($type->help) ? '' . filter_xss_admin($type->help) . '
' : ''); } } @@ -165,7 +165,7 @@ function node_fieldable_info() { // 'cacheable' => FALSE, // Bundles must provide human readable name so // we can create help and error messages about them. - 'bundles' => node_get_types('names'), + 'bundles' => node_get_names(), ), ); return $return; @@ -470,56 +470,93 @@ function node_teaser($body, $format = NU } /** - * Builds a list of available node types, and returns all of part of this list - * in the specified format. + * Builds a list of all the available node types. + * + * @param $reset + * Whether or not to reset the node list (defaults to FALSE). + * @return + * A list of node types, as an array. + */ +function node_get_types($reset = FALSE) { + return _node_types_build($reset)->types; +} + +/** + * Returns false if the node type does not exist. Otherwise returns the node's type. * - * @param $op - * The format in which to return the list. When this is set to 'type', - * 'base', or 'name', only the specified node type is returned. When set to - * 'types' or 'names', all node types are returned. - * @param $node + *@param $node * A node object, array, or string that indicates the node type to return. * Leave at default value (NULL) to return a list of all node types. - * @param $reset - * Whether or not to reset this function's internal cache (defaults to - * FALSE). + * @return + * A single node type, as a string. Returns FALSE if the node name is not found. + */ +function node_get_type($node) { + $type = _node_extract_type($node); + $types = _node_types_build()->types; + return isset($types[$type]) ? $types[$type] : FALSE; +} + +/** + * Returns false if the node base type does not exist. Otherwise returns the node's base type. * + *@param $node + * A node object, array, or string that indicates the node type to return. + * Leave at default value (NULL) to return a list of all node types. * @return - * Either an array of all available node types, or a single node type, in a - * variable format. Returns FALSE if the node type is not found. + * A single node type, as a string. Returns FALSE if the node name is not found. */ -function node_get_types($op = 'types', $node = NULL, $reset = FALSE) { - static $_node_types, $_node_names; +function node_get_base($node) { + $type = _node_extract_type($node); + $types = _node_types_build()->types; + return isset($types[$type]) && isset($types[$type]->base) ? $types[$type]->base : FALSE; +} + +/** + * Returns a list of available node names. + * + * @return + * A list of node names, as an array. + */ +function node_get_names() { + return _node_types_build()->names; +} + +/** + * Returns false if the node name does not exist. Otherwise returns the node's name. + * + * @param $node + * A node object, array, or string that indicates the node type to return. + * + * @return + * A single node name, as a string. Returns FALSE if the node name is not found. + */ +function node_get_name($node) { + $type = _node_extract_type($node); + $types = _node_types_build()->names; + return isset($types[$type]) ? $types[$type] : FALSE; +} - if ($reset || !isset($_node_types)) { - list($_node_types, $_node_names) = _node_types_build(); +/** + * Extracts the type info from the passed variable. + * + * The function tries to extract either the property or key type. In case + * $node is a string, the value is simply passed back. + * + * @param $node + * Either a string, array or object, containing the type information. + * + * @return + * Node type of the passed in data. + */ +function _node_extract_type($node) { + if (is_array($node)) { + return $node['type']; } - - if ($node) { - if (is_array($node)) { - $type = $node['type']; - } - elseif (is_object($node)) { - $type = $node->type; - } - elseif (is_string($node)) { - $type = $node; - } - if (!isset($_node_types[$type])) { - return FALSE; - } + if (is_object($node)) { + return $node->type; } - switch ($op) { - case 'types': - return $_node_types; - case 'type': - return isset($_node_types[$type]) ? $_node_types[$type] : FALSE; - case 'base': - return isset($_node_types[$type]->base) ? $_node_types[$type]->base : FALSE; - case 'names': - return $_node_names; - case 'name': - return isset($_node_names[$type]) ? $_node_names[$type] : FALSE; + if (is_string($node)) { + return $node; } } @@ -530,7 +567,7 @@ function node_get_types($op = 'types', $ function node_types_rebuild() { _node_types_build(); - $node_types = node_get_types('types', NULL, TRUE); + $node_types = node_get_types(TRUE); foreach ($node_types as $type => $info) { if (!empty($info->is_new)) { @@ -541,7 +578,7 @@ function node_types_rebuild() { } } - _node_types_build(); + _node_types_build(TRUE); // This is required for proper menu items at node/add/type. menu_rebuild(); } @@ -604,7 +641,7 @@ function node_type_save($info) { * The machine-readable name of the node type to be deleted. */ function node_type_delete($type) { - $info = node_get_types('type', $type); + $info = node_get_type($type); db_query("DELETE FROM {node_type} WHERE type = '%s'", $type); module_invoke_all('node_type', 'delete', $info); } @@ -632,10 +669,14 @@ function node_type_update_nodes($old_typ * by comparing this information with the node types in the {node_type} table. * */ -function _node_types_build() { +function _node_types_build($reset = FALSE) { + static $_node_types_cache; $_node_types = array(); $_node_names = array(); + if (!$reset && is_object($_node_types_cache)) { + return $_node_types_cache; + } $info_array = module_invoke_all('node_info'); foreach ($info_array as $type => $info) { $info['type'] = $type; @@ -665,7 +706,7 @@ function _node_types_build() { asort($_node_names); - return array($_node_types, $_node_names); + return $_node_types_cache = (object)array('types' => $_node_types, 'names' => $_node_names); } /** @@ -730,7 +771,7 @@ function node_type_set_defaults($info = * TRUE iff the $hook exists in the node type of $node. */ function node_hook(&$node, $hook) { - $base = node_get_types('base', $node); + $base = node_get_base($node); return module_hook($base, $hook); } @@ -748,7 +789,7 @@ function node_hook(&$node, $hook) { */ function node_invoke(&$node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) { if (node_hook($node, $hook)) { - $base = node_get_types('base', $node); + $base = node_get_base($node); $function = $base . '_' . $hook; return ($function($node, $a2, $a3, $a4)); } @@ -904,7 +945,7 @@ function node_load_multiple($nids = arra // Call node type specific callbacks on each typed array of nodes. foreach ($typed_nodes as $type => $nodes_of_type) { if (node_hook($type, 'load')) { - $function = node_get_types('base', $type) . '_load'; + $function = node_get_base($type) . '_load'; $function($nodes_of_type); } } @@ -970,7 +1011,7 @@ function node_load($nid, $vid = array(), function node_validate($node, $form = array()) { // Convert the node to an object, if necessary. $node = (object)$node; - $type = node_get_types('type', $node); + $type = node_get_type($node); // Make sure the body has the minimum number of words. // TODO : use a better word counting algorithm that will work in other languages @@ -1186,7 +1227,7 @@ function node_delete($nid) { search_wipe($node->nid, 'node'); } watchdog('content', '@type: deleted %title.', array('@type' => $node->type, '%title' => $node->title)); - drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_types('name', $node), '%title' => $node->title))); + drupal_set_message(t('@type %title has been deleted.', array('@type' => node_get_name($node), '%title' => $node->title))); } } @@ -1507,7 +1548,7 @@ function node_search($op = 'search', $ke $results[] = array( 'link' => url('node/' . $item->sid, array('absolute' => TRUE)), - 'type' => check_plain(node_get_types('name', $node)), + 'type' => check_plain(node_get_name($node)), 'title' => $node->title, 'user' => theme('username', $node), 'date' => $node->changed, @@ -1744,7 +1785,7 @@ function node_menu() { 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); - foreach (node_get_types('types', NULL, TRUE) as $type) { + foreach (node_get_types(TRUE) as $type) { $type_url_str = str_replace('_', '-', $type->type); $items['node/add/' . $type_url_str] = array( 'title' => $type->name, @@ -2169,7 +2210,7 @@ function node_form_search_form_alter(&$f } // Node types: - $types = array_map('check_plain', node_get_types('names')); + $types = array_map('check_plain', node_get_names()); $form['advanced']['type'] = array( '#type' => 'checkboxes', '#title' => t('Only of the type(s)'), @@ -2326,7 +2367,7 @@ function node_access($op, $node, $accoun // Can't use node_invoke('access', $node), because the access hook takes the // $op parameter before the $node parameter. - $base = node_get_types('base', $node); + $base = node_get_base($node); $access = module_invoke($base, 'access', $op, $node, $account); if (!is_null($access)) { return $access; @@ -2777,7 +2818,9 @@ function node_content_access($op, $node, * Implementation of hook_form(). */ function node_content_form($node, $form_state) { - $type = node_get_types('type', $node); + + $type = node_get_type($node); + $form = array(); if ($type->has_title) { @@ -2956,7 +2999,7 @@ function node_action_info() { */ function node_publish_action(&$node, $context = array()) { $node->status = 1; - watchdog('action', 'Set @type %title to published.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Set @type %title to published.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -2965,7 +3008,7 @@ function node_publish_action(&$node, $co */ function node_unpublish_action(&$node, $context = array()) { $node->status = 0; - watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -2974,7 +3017,7 @@ function node_unpublish_action(&$node, $ */ function node_make_sticky_action(&$node, $context = array()) { $node->sticky = 1; - watchdog('action', 'Set @type %title to sticky.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Set @type %title to sticky.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -2983,7 +3026,7 @@ function node_make_sticky_action(&$node, */ function node_make_unsticky_action(&$node, $context = array()) { $node->sticky = 0; - watchdog('action', 'Set @type %title to unsticky.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Set @type %title to unsticky.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -2992,7 +3035,7 @@ function node_make_unsticky_action(&$nod */ function node_promote_action(&$node, $context = array()) { $node->promote = 1; - watchdog('action', 'Promoted @type %title to front page.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Promoted @type %title to front page.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -3001,7 +3044,7 @@ function node_promote_action(&$node, $co */ function node_unpromote_action(&$node, $context = array()) { $node->promote = 0; - watchdog('action', 'Removed @type %title from front page.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Removed @type %title from front page.', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -3010,7 +3053,7 @@ function node_unpromote_action(&$node, $ */ function node_save_action($node) { node_save($node); - watchdog('action', 'Saved @type %title', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Saved @type %title', array('@type' => node_get_name($node), '%title' => $node->title)); } /** @@ -3020,7 +3063,7 @@ function node_save_action($node) { function node_assign_owner_action(&$node, $context) { $node->uid = $context['owner_uid']; $owner_name = db_result(db_query("SELECT name FROM {users} WHERE uid = %d", $context['owner_uid'])); - watchdog('action', 'Changed owner of @type %title to uid %name.', array('@type' => node_get_types('type', $node), '%title' => $node->title, '%name' => $owner_name)); + watchdog('action', 'Changed owner of @type %title to uid %name.', array('@type' => node_get_type($node), '%title' => $node->title, '%name' => $owner_name)); } function node_assign_owner_action_form($context) { @@ -3100,7 +3143,7 @@ function node_unpublish_by_keyword_actio foreach ($context['keywords'] as $keyword) { if (strstr(drupal_render(node_build(clone $node)), $keyword) || strstr($node->title, $keyword)) { $node->status = 0; - watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_get_types('name', $node), '%title' => $node->title)); + watchdog('action', 'Set @type %title to unpublished.', array('@type' => node_get_name($node), '%title' => $node->title)); break; } } @@ -3115,7 +3158,7 @@ function node_unpublish_by_keyword_actio * An array of permission names and descriptions. */ function node_list_permissions($type) { - $info = node_get_types('type', $type); + $info = node_get_type($type); $type = check_plain($info->type); // Build standard list of node permissions for this type. Index: modules/node/node.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v retrieving revision 1.57 diff -u -p -r1.57 node.pages.inc --- modules/node/node.pages.inc 14 Mar 2009 23:01:36 -0000 1.57 +++ modules/node/node.pages.inc 19 Mar 2009 22:26:20 -0000 @@ -11,7 +11,7 @@ * Menu callback; presents the node editing form, or redirects to delete confirmation. */ function node_page_edit($node) { - $type_name = node_get_types('name', $node); + $type_name = node_get_name($node); drupal_set_title(t('Edit @type @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH); return drupal_get_form($node->type . '_node_form', $node); } @@ -440,7 +440,7 @@ function node_form_submit($form, &$form_ node_save($node); $node_link = l(t('view'), 'node/' . $node->nid); $watchdog_args = array('@type' => $node->type, '%title' => $node->title); - $t_args = array('@type' => node_get_types('name', $node), '%title' => $node->title); + $t_args = array('@type' => node_get_name($node), '%title' => $node->title); if ($insert) { watchdog('content', '@type: added %title.', $watchdog_args, WATCHDOG_NOTICE, $node_link); @@ -572,7 +572,7 @@ function node_revision_revert_confirm_su node_save($node_revision); watchdog('content', '@type: reverted %title revision %revision.', array('@type' => $node_revision->type, '%title' => $node_revision->title, '%revision' => $node_revision->vid)); - drupal_set_message(t('@type %title has been reverted back to the revision from %revision-date.', array('@type' => node_get_types('name', $node_revision), '%title' => $node_revision->title, '%revision-date' => format_date($node_revision->revision_timestamp)))); + drupal_set_message(t('@type %title has been reverted back to the revision from %revision-date.', array('@type' => node_get_name($node_revision), '%title' => $node_revision->title, '%revision-date' => format_date($node_revision->revision_timestamp)))); $form_state['redirect'] = 'node/' . $node_revision->nid . '/revisions'; } @@ -586,7 +586,7 @@ function node_revision_delete_confirm_su db_query("DELETE FROM {node_revision} WHERE nid = %d AND vid = %d", $node_revision->nid, $node_revision->vid); node_invoke_node($node_revision, 'delete_revision'); watchdog('content', '@type: deleted %title revision %revision.', array('@type' => $node_revision->type, '%title' => $node_revision->title, '%revision' => $node_revision->vid)); - drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', array('%revision-date' => format_date($node_revision->revision_timestamp), '@type' => node_get_types('name', $node_revision), '%title' => $node_revision->title))); + drupal_set_message(t('Revision from %revision-date of @type %title has been deleted.', array('%revision-date' => format_date($node_revision->revision_timestamp), '@type' => node_get_name($node_revision), '%title' => $node_revision->title))); $form_state['redirect'] = 'node/' . $node_revision->nid; if (db_result(db_query('SELECT COUNT(vid) FROM {node_revision} WHERE nid = %d', $node_revision->nid)) > 1) { $form_state['redirect'] .= '/revisions'; Index: modules/poll/poll.module =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v retrieving revision 1.290 diff -u -p -r1.290 poll.module --- modules/poll/poll.module 9 Mar 2009 20:36:58 -0000 1.290 +++ modules/poll/poll.module 19 Mar 2009 22:26:22 -0000 @@ -206,7 +206,7 @@ function poll_form(&$node, $form_state) $admin = user_access('administer nodes') || user_access('edit any poll content') || (user_access('edit own poll content') && $user->uid == $node->uid); - $type = node_get_types('type', $node); + $type = node_get_type($node); $form = array( '#cache' => TRUE, Index: modules/poll/poll.test =================================================================== RCS file: /cvs/drupal/drupal/modules/poll/poll.test,v retrieving revision 1.15 diff -u -p -r1.15 poll.test --- modules/poll/poll.test 1 Feb 2009 06:48:15 -0000 1.15 +++ modules/poll/poll.test 19 Mar 2009 22:26:23 -0000 @@ -41,7 +41,7 @@ class PollTestCase extends DrupalWebTest $this->drupalPost(NULL, $edit, t('Save')); $node = $this->drupalGetNodeByTitle($title); - $this->assertRaw(t('@type %title has been created.', array('@type' => node_get_types('name', 'poll'), '%title' => $title)), 'Poll has been created.'); + $this->assertRaw(t('@type %title has been created.', array('@type' => node_get_name('poll'), '%title' => $title)), 'Poll has been created.'); $this->assertTrue($node->nid, t('Poll has been found in the database')); return isset($node->nid) ? $node->nid : FALSE; Index: modules/search/search.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.api.php,v retrieving revision 1.5 diff -u -p -r1.5 search.api.php --- modules/search/search.api.php 8 Mar 2009 04:25:05 -0000 1.5 +++ modules/search/search.api.php 19 Mar 2009 22:26:24 -0000 @@ -181,7 +181,7 @@ function hook_search($op = 'search', $ke $results[] = array( 'link' => url('node/' . $item->sid, array('absolute' => TRUE)), - 'type' => check_plain(node_get_types('name', $node)), + 'type' => check_plain(node_get_name($node)), 'title' => $node->title, 'user' => theme('username', $node), 'date' => $node->changed, Index: modules/simpletest/drupal_web_test_case.php =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v retrieving revision 1.91 diff -u -p -r1.91 drupal_web_test_case.php --- modules/simpletest/drupal_web_test_case.php 17 Mar 2009 23:26:33 -0000 1.91 +++ modules/simpletest/drupal_web_test_case.php 19 Mar 2009 22:26:30 -0000 @@ -534,7 +534,7 @@ class DrupalWebTestCase { // find a non-existent random type name. do { $name = strtolower($this->randomName(3, 'type_')); - } while (node_get_types('type', $name)); + } while (node_get_type($name)); // Populate defaults array $defaults = array( Index: modules/system/system.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v retrieving revision 1.24 diff -u -p -r1.24 system.api.php --- modules/system/system.api.php 10 Mar 2009 16:08:43 -0000 1.24 +++ modules/system/system.api.php 19 Mar 2009 22:26:44 -0000 @@ -895,7 +895,7 @@ function hook_mail($key, &$message, $par $variables += array( '%uid' => $node->uid, '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)), - '%node_type' => node_get_types('name', $node), + '%node_type' => node_get_name($node), '%title' => $node->title, '%teaser' => $node->teaser, '%body' => $node->body, Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.673 diff -u -p -r1.673 system.module --- modules/system/system.module 17 Mar 2009 15:26:29 -0000 1.673 +++ modules/system/system.module 19 Mar 2009 22:26:44 -0000 @@ -2067,7 +2067,7 @@ function system_mail($key, &$message, $p $variables += array( '%uid' => $node->uid, '%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)), - '%node_type' => node_get_types('name', $node), + '%node_type' => node_get_name($node), '%title' => $node->title, '%teaser' => $node->teaser, '%body' => $node->body, @@ -2141,7 +2141,7 @@ function system_message_action(&$object, $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_get_name($node)), '%title' => filter_xss($node->title), '%teaser' => filter_xss($node->teaser), '%body' => filter_xss($node->body), Index: modules/taxonomy/taxonomy.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v retrieving revision 1.47 diff -u -p -r1.47 taxonomy.admin.inc --- modules/taxonomy/taxonomy.admin.inc 14 Mar 2009 20:13:27 -0000 1.47 +++ modules/taxonomy/taxonomy.admin.inc 19 Mar 2009 22:26:47 -0000 @@ -19,7 +19,7 @@ function taxonomy_overview_vocabularies( foreach ($vocabularies as $vocabulary) { $types = array(); foreach ($vocabulary->nodes as $type) { - $node_type = node_get_types('name', $type); + $node_type = node_get_name($type); $types[] = $node_type ? check_plain($node_type) : check_plain($type); } $form[$vocabulary->vid]['#vocabulary'] = $vocabulary; @@ -145,7 +145,7 @@ function taxonomy_form_vocabulary(&$form '#type' => 'checkboxes', '#title' => t('Content types'), '#default_value' => $edit['nodes'], - '#options' => array_map('check_plain', node_get_types('names')), + '#options' => array_map('check_plain', node_get_names()), '#description' => t('Select content types to categorize using this vocabulary.'), ); $form['settings'] = array( Index: modules/tracker/tracker.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v retrieving revision 1.16 diff -u -p -r1.16 tracker.pages.inc --- modules/tracker/tracker.pages.inc 26 Feb 2009 07:30:28 -0000 1.16 +++ modules/tracker/tracker.pages.inc 19 Mar 2009 22:26:47 -0000 @@ -50,7 +50,7 @@ function tracker_page($account = NULL, $ } $rows[] = array( - check_plain(node_get_types('name', $node->type)), + check_plain(node_get_name($node->type)), l($node->title, "node/$node->nid") . ' ' . theme('mark', node_mark($node->nid, $node->changed)), theme('username', $node), array('class' => 'replies', 'data' => $comments),