Index: upgrade_status.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/upgrade_status/upgrade_status.admin.inc,v
retrieving revision 1.9
diff -u -p -r1.9 upgrade_status.admin.inc
--- upgrade_status.admin.inc 2 Aug 2009 01:36:45 -0000 1.9
+++ upgrade_status.admin.inc 17 Apr 2010 03:10:47 -0000
@@ -275,6 +275,12 @@ function upgrade_status_calculate_projec
* Project name to check.
* @return
* TRUE if module has been moved into core.
+ *
+ * @todo Handle partial core additions, e.g.
+ * - Token
+ * - CTools: AJAX framework
+ * - Taxonomy image
+ * - Better Formats, Filter by node type
*/
function upgrade_status_moved_into_core(&$projects, $project) {
$core = TRUE;
@@ -284,6 +290,29 @@ function upgrade_status_moved_into_core(
$projects[$project]['in_core_note'] = t('Please note that the syntax for actions used by the 5.x-1.x and 4.7 versions of Actions module are different to triggers in Drupal 6.x. For further information please refer to the Actions module project page.', array('!project-url' => 'http://drupal.org/project/actions'));
break;
+ case 'ahah_helper':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'autoload':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'auto_menutitle':
+ case 'automaticmenu':
+ case 'automenu':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'admin_hover':
+ case 'block_edit':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'adminrole':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'ahah_forms':
$projects[$project]['in_core_since'] = '6.x';
break;
@@ -292,10 +321,60 @@ function upgrade_status_moved_into_core(
$projects[$project]['in_core_since'] = '6.x';
break;
+ case 'block_node_visibility':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'blocks404':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'book_bridge':
$projects[$project]['in_core_since'] = '6.x';
break;
+ case 'cck':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'checkbox_validate':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'comment_display':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'config_perms':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'content_taxonomy':
+ case 'field_taxonomy':
+ case 'term_fields':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'dbtng':
+ case 'transaction':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'elements':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'filefield':
+ case 'upload_element':
+ case 'upload_preview':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'filter_default':
+ case 'user_default_filter':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'find_path':
$projects[$project]['in_core_since'] = '6.x';
break;
@@ -308,29 +387,146 @@ function upgrade_status_moved_into_core(
$projects[$project]['in_core_since'] = '6.x';
break;
+ case 'image':
+ $projects[$project]['in_core_since'] = '7.x';
+ // @todo Add 'in_core_warning' to warn users that this module has to be
+ // replaced with 7.x-1.x before trying to upgrade.
+ $projects[$project]['in_core_note'] = t('Drupal core implements images as ImageField and has taken over the "image" namespace. This may not cover your use-case of images (regarding access, direct image access via URL, and attached data like comments, votes, or geo coordinates). Therefore, the Image project will likely remain and provide an image_node module; please participate and contribute to the porting effort.', array(
+ '@imagefield-url' => 'http://drupal.org/project/imagefield',
+ '@image-url' => 'http://drupal.org/project/image',
+ '@image-upgrade-url' => 'http://drupal.org/node/513096',
+ ));
+ break;
+
+ case 'imageapi':
+ $projects[$project]['in_core_since'] = '7.x';
+ $projects[$project]['in_core_note'] = t('Most of ImageAPI has been moved into Drupal core. Under 7.x, this module provides an ImageMagick toolkit and provides an unsharpen mask action.');
+ break;
+
+ case 'imagecache':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'imagefield':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'input_format_permissions':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'javascript_aggregator':
$projects[$project]['in_core_since'] = '6.x';
$projects[$project]['in_core_note'] = t('Please note that there is a version of JavaScript Aggregator module for Drupal 6.x, which additionally minifies JavaScript.', array('!project-url' => 'http://drupal.org/project/javascript_aggregator'));
break;
+ case 'jq':
+ case 'jqp':
+ case 'plugins':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'jquery_cookie':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'jquery_ui':
+ $projects[$project]['in_core_since'] = '7.x';
+ $projects[$project]['in_core_note'] = t('The jQuery UI library itself has been added to Drupal core and various functions exist to load jQuery UI plugins. This module may only be required for advanced jQuery UI integration.');
+ break;
+
+ case 'jsalter':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'login_security':
+ $projects[$project]['in_core_since'] = '7.x';
+ $projects[$project]['in_core_note'] = t('If required, internal user login flood protection parameters may be configured using the Flood control module.', array('@flood-control-url' => 'http://drupal.org/project/flood_control'));
+ break;
+
+ case 'menuless_nodetype':
+ case 'ctm':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'nodepreview_by_type':
+ case 'preview':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'openid':
$projects[$project]['in_core_since'] = '6.x';
break;
+ case 'permissions_api':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'plugin_manager':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'poormanscron':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'rdf':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'seven':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'simpletest':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'tar':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'taxonomy_delegate':
+ case 'vocabperms':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'themesettingsapi':
$projects[$project]['in_core_since'] = '6.x';
break;
+ case 'token':
+ $projects[$project]['in_core_since'] = '7.x';
+ $projects[$project]['in_core_note'] = t('Drupal core does not provide a user interface to browse tokens in forms.');
+ break;
+
case 'update_status':
$projects[$project]['in_core_since'] = '6.x';
$projects[$project]['in_core_note'] = t('Please note that some of the advanced settings in the 5.x version of Update status are not present in the update.module in 6.x core, and have been moved into the Update status advanced settings module for Drupal 6.x and beyond.', array('!project-url' => 'http://drupal.org/project/update_advanced'));
break;
+ case 'url_alter':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'user_cancellation':
+ case 'user_delete':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
case 'user_status':
$projects[$project]['in_core_since'] = '6.x';
$projects[$project]['in_core_note'] = t('There is no database upgrade path for sites that used the 5.x version of the user_status module to migrate the message templates to the new settings in core. Furthermore, the place-holders available in these templates are different in 6.x core. Therefore, users will have to re-enter their message templates into the core settings at admin/user/settings.');
break;
+ case 'vertical_tabs':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
+ case 'view_unpublished':
+ $projects[$project]['in_core_since'] = '7.x';
+ break;
+
default:
$core = FALSE;
}