User: dries Branch: HEAD Date: Sun, 28 Aug 2005 15:29:34 +0000 Modified files: /includes theme.inc /modules blog.module blogapi.module book.module forum.module node.module page.module poll.module story.module system.module taxonomy.module tracker.module Log message: - Patch #29785 by Chx: multiple node types were broken so we refactored part of the node system! If you have a module that implements node types, you'll have to udpate its CVS HEAD version. We replaced _node_name() and _node_types() by _node(). The new _node() hook let's you define one or more node types, including their names. The implementation of the _node() hook needs to: return array($type1 => array('name' => $name1, 'base' => $base1), $type2 => array('name' => $name2, 'base' => $base2)); where $type is the node type, $name is the human readable name of the type and $base is used instead of <hook> for <hook>_load, <hook>_view, etc. For example, the story module's node hook looks like this: function story_node() { return array('story' => array('name' => t('story'), 'base' => 'story')); } The page module's node hook module like: function page_node() { return array('page' => array('name' => t('page'), 'base' => 'page')); } However, more complex node modules like the project module and the flexinode module can use the 'base' parameter to specify a different base. The project module implements two node types, proejcts and issues, so it can do: function project_node() { return array( array('project_project' => array('name' => t('project'), 'base' => 'project'), array('project_issue' => array('name' => t('issue'), 'base' => 'project_issue')); } In the flexinode module's case there can only one base ... This hook will simplify the CCK, and will make it easy (or easier) to merge the story and page module. In addition, node_list() became node_get_types(). In addition, we created the following functions: node_get_name($type) and node_get_base($type). Links: http://cvs.drupal.org/diff.php?path=drupal/includes/theme.inc&old=1.255&new=... http://cvs.drupal.org/diff.php?path=drupal/modules/blog.module&old=1.223&new... http://cvs.drupal.org/diff.php?path=drupal/modules/blogapi.module&old=1.53&n... http://cvs.drupal.org/diff.php?path=drupal/modules/book.module&old=1.311&new... http://cvs.drupal.org/diff.php?path=drupal/modules/forum.module&old=1.262&ne... http://cvs.drupal.org/diff.php?path=drupal/modules/node.module&old=1.523&new... http://cvs.drupal.org/diff.php?path=drupal/modules/page.module&old=1.133&new... http://cvs.drupal.org/diff.php?path=drupal/modules/poll.module&old=1.167&new... http://cvs.drupal.org/diff.php?path=drupal/modules/story.module&old=1.168&ne... http://cvs.drupal.org/diff.php?path=drupal/modules/system.module&old=1.227&n... http://cvs.drupal.org/diff.php?path=drupal/modules/taxonomy.module&old=1.219... http://cvs.drupal.org/diff.php?path=drupal/modules/tracker.module&old=1.120&...