diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 039a351..994ee1c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,6 +2,12 @@ Drupal 8.0, xxxx-xx-xx (development version) ---------------------- +- Removed modules from core + * The following modules have been removed from core, because contributed + modules and configuration can provide similar functionality. + * Blog module + * Profile module + Drupal 7.0, 2011-01-05 ---------------------- - Database: diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt index 3bb195e..81eb1a3 100644 --- a/MAINTAINERS.txt +++ b/MAINTAINERS.txt @@ -151,9 +151,6 @@ Aggregator module Block module - John Albin Wilkins 'JohnAlbin' -Blog module -- ? - Book module - Peter Wolanin 'pwolanin' diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 6061569..bcc81f3 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -1409,13 +1409,13 @@ function drupal_unpack($obj, $field = 'data') { * variable text such as user names or link URLs into translated text. Variable * substitution looks like this: * @code - * $text = t("@name's blog", array('@name' => format_username($account))); + * $text = t("@name's foo", array('@name' => format_username($account))); * @endcode * Basically, you can put variables like @name into your string, and t() will * substitute their sanitized values at translation time (see $args below or * the Localization API pages referenced above for details). Translators can * then rearrange the string as necessary for the language (e.g., in Spanish, - * it might be "blog de @name"). + * it might be "foo de @name"). * * During the Drupal installation phase, some resources used by t() wil not be * available to code that needs localization. See st() and get_t() for diff --git a/modules/node/node.api.php b/modules/node/node.api.php index 1801b67..8aa42fb 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -792,7 +792,6 @@ function hook_node_submit($node, $form, &$form_state) { * the RSS item generated for this node. * For details on how this is used, see node_feed(). * - * @see blog_node_view() * @see forum_node_view() * @see comment_node_view() * @@ -848,10 +847,9 @@ function hook_node_view_alter(&$build) { /** * Define module-provided node types. * - * This hook allows a module to define one or more of its own node types. For - * example, the blog module uses it to define a blog node-type named "Blog - * entry." The name and attributes of each desired node type are specified in - * an array returned by the hook. + * This hook allows a module to define one or more of its own node types. The + * name and attributes of each desired node type are specified in an array + * returned by the hook. * * Only module-provided node types should be defined through this hook. User- * provided (or 'custom') node types should be defined only in the 'node_type' @@ -892,10 +890,10 @@ function hook_node_view_alter(&$build) { */ function hook_node_info() { return array( - 'blog' => array( - 'name' => t('Blog entry'), - 'base' => 'blog', - 'description' => t('Use for multi-user blogs. Every user gets a personal blog.'), + 'foo' => array( + 'name' => t('Foo entry'), + 'base' => 'foo', + 'description' => t('Use for posting foos to the site.'), ) ); } diff --git a/modules/node/node.module b/modules/node/node.module index 1ecc093..add058f 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1320,7 +1320,7 @@ function node_view($node, $view_mode = 'full', $langcode = NULL) { * default use cases: * - full (default): node is being displayed on its own page (node/123) * - teaser: node is being displayed on the default home page listing, on - * taxonomy listing pages, or on blog listing pages. + * taxonomy listing pages, or similar. * - rss: node displayed in an RSS feed. * If search.module is enabled: * - search_index: node is being indexed for search. diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php index 6d0f489..b399030 100644 --- a/modules/node/node.tpl.php +++ b/modules/node/node.tpl.php @@ -23,8 +23,8 @@ * preprocess functions. The default values can be one or more of the * following: * - node: The current template type, i.e., "theming hook". - * - node-[type]: The current node type. For example, if the node is a - * "Blog entry" it would result in "node-blog". Note that the machine + * - node-[type]: The current node type. For example, if the node is an + * "Article" it would result in "node-article". Note that the machine * name will often be in a short form of the human readable label. * - node-teaser: Nodes in teaser form. * - node-preview: Nodes in preview mode. @@ -42,7 +42,7 @@ * * Other variables: * - $node: Full node object. Contains data that may not be safe. - * - $type: Node type, i.e. story, page, blog, etc. + * - $type: Node type, i.e. article, page, etc. * - $comment_count: Number of comments attached to the node. * - $uid: User ID of the node author. * - $created: Time the node was published formatted in Unix timestamp. diff --git a/modules/rdf/rdf.api.php b/modules/rdf/rdf.api.php index 691f7ef..a546e75 100644 --- a/modules/rdf/rdf.api.php +++ b/modules/rdf/rdf.api.php @@ -20,7 +20,7 @@ * @return * A list of mapping structures, where each mapping is an associative array: * - type: The name of an entity type (e.g., 'node', 'comment', and so on.) - * - bundle: The name of the bundle (e.g., 'page', 'blog', or + * - bundle: The name of the bundle (e.g., 'page', 'article', or * RDF_DEFAULT_BUNDLE for default mappings.) * - mapping: The mapping structure which applies to the entity type and * bundle. A mapping structure is an array with keys corresponding to @@ -47,7 +47,7 @@ function hook_rdf_mapping() { return array( array( 'type' => 'node', - 'bundle' => 'blog', + 'bundle' => 'article', 'mapping' => array( 'rdftype' => array('sioct:Weblog'), 'title' => array( diff --git a/modules/simpletest/tests/path.test b/modules/simpletest/tests/path.test index 0c8ecda..f072ace 100644 --- a/modules/simpletest/tests/path.test +++ b/modules/simpletest/tests/path.test @@ -55,18 +55,18 @@ class DrupalMatchPathTestCase extends DrupalWebTestCase { private function drupalMatchPathTests() { return array( // Single absolute paths. - 'blog/1' => array( - 'blog/1' => TRUE, - 'blog/2' => FALSE, + 'foo/1' => array( + 'foo/1' => TRUE, + 'foo/2' => FALSE, 'test' => FALSE, ), // Single paths with wildcards. - 'blog/*' => array( - 'blog/1' => TRUE, - 'blog/2' => TRUE, - 'blog/3/edit' => TRUE, - 'blog/' => TRUE, - 'blog' => FALSE, + 'foo/*' => array( + 'foo/1' => TRUE, + 'foo/2' => TRUE, + 'foo/3/edit' => TRUE, + 'foo/' => TRUE, + 'foo' => FALSE, 'test' => FALSE, ), // Single paths with multiple wildcards. @@ -102,14 +102,14 @@ class DrupalMatchPathTestCase extends DrupalWebTestCase { 'test/example' => FALSE, ), // Multiple paths with the \r delimiter. - "user/*\rblog/*" => array( + "user/*\rfoo/*" => array( 'user/1' => TRUE, - 'blog/1' => TRUE, - 'user/1/blog/1' => TRUE, - 'user/blog' => TRUE, + 'foo/1' => TRUE, + 'user/1/foo/1' => TRUE, + 'user/foo' => TRUE, 'test/example' => FALSE, 'user' => FALSE, - 'blog' => FALSE, + 'foo' => FALSE, ), // Multiple paths with the \r\n delimiter. "test\r\n" => array( diff --git a/modules/system/system.api.php b/modules/system/system.api.php index ab3e0fc..a42cb1b 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1202,15 +1202,15 @@ function hook_menu_get_item_alter(&$router_item, $path, $original_map) { * http://drupal.org/node/102338. */ function hook_menu() { - $items['blog'] = array( - 'title' => 'blogs', - 'page callback' => 'blog_page', + $items['foo'] = array( + 'title' => 'Foos', + 'page callback' => 'foo_page', 'access arguments' => array('access content'), 'type' => MENU_SUGGESTED_ITEM, ); - $items['blog/feed'] = array( + $items['foo/feed'] = array( 'title' => 'RSS feed', - 'page callback' => 'blog_feed', + 'page callback' => 'foo_feed', 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, ); diff --git a/modules/user/user.api.php b/modules/user/user.api.php index 069a9f8..b9f82bd 100644 --- a/modules/user/user.api.php +++ b/modules/user/user.api.php @@ -327,14 +327,12 @@ function hook_user_logout($account) { * @see hook_entity_view() */ function hook_user_view($account, $view_mode, $langcode) { - if (user_access('create blog content', $account)) { - $account->content['summary']['blog'] = array( - '#type' => 'user_profile_item', - '#title' => t('Blog'), - '#markup' => l(t('View recent blog entries'), "blog/$account->uid", array('attributes' => array('title' => t("Read !username's latest blog entries.", array('!username' => format_username($account)))))), - '#attributes' => array('class' => array('blog')), - ); - } + $account->content['summary']['information'] = array( + '#type' => 'user_profile_item', + '#title' => t('Information'), + '#markup' => l(t('View additional information about this user'), "user/$account->uid", array('attributes' => array('title' => t("Read !username's additional information.", array('!username' => format_username($account)))))), + '#attributes' => array('class' => array('blog')), + ); } /** diff --git a/modules/user/user.test b/modules/user/user.test index 6ecbfac..5f6c319 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -2104,10 +2104,10 @@ class UserAuthmapAssignmentTestCase extends DrupalWebTestCase { $this->assertIdentical(user_get_authmaps($authname), $expected_output, t('Authmap for authname %authname was set correctly.', array('%authname' => $authname))); } - // Remove authmap for module poll, add authmap for module blog. + // Remove authmap for poll, add authmap for node. $authmaps = array( 'authname_poll' => NULL, - 'authname_blog' => 'external username three', + 'authname_node' => 'external username three', ); user_set_authmaps($account, $authmaps); @@ -2118,7 +2118,7 @@ class UserAuthmapAssignmentTestCase extends DrupalWebTestCase { // Assert that a new authmap was created for external username three, and // existing authmaps for external username two were unchanged. - $expected_authmaps['external username three'] = array('blog' => 'external username three'); + $expected_authmaps['external username three'] = array('node' => 'external username three'); foreach ($expected_authmaps as $authname => $expected_output) { $this->assertIdentical(user_get_authmaps($authname), $expected_output, t('Authmap for authname %authname was set correctly.', array('%authname' => $authname))); } diff --git a/themes/bartik/templates/node.tpl.php b/themes/bartik/templates/node.tpl.php index f215b47..1bdd841 100644 --- a/themes/bartik/templates/node.tpl.php +++ b/themes/bartik/templates/node.tpl.php @@ -23,8 +23,8 @@ * preprocess functions. The default values can be one or more of the * following: * - node: The current template type, i.e., "theming hook". - * - node-[type]: The current node type. For example, if the node is a - * "Blog entry" it would result in "node-blog". Note that the machine + * - node-[type]: The current node type. For example, if the node is an + * "Article" it would result in "node-article". Note that the machine * name will often be in a short form of the human readable label. * - node-teaser: Nodes in teaser form. * - node-preview: Nodes in preview mode.