Issue #1615312 by dsdeiz, David_Rothstein: Make sure all D7 to D7 updates are listed in the updates-7.x-extra group

modules/block/block.install

@@ -456,6 +456,15 @@ function block_update_7007() {
   ));
 }
 
+/**
+ * @} End of "addtogroup updates-6.x-to-7.x".
+ */
+
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Update database to match Drupal 7 schema.
  */
@@ -464,5 +473,5 @@ function block_update_7008() {
 }
 
 /**
- * @} End of "addtogroup updates-6.x-to-7.x".
+ * @} End of "addtogroup updates-7.x-extra".
  */

modules/color/color.install

@@ -41,6 +41,11 @@ function color_requirements($phase) {
   return $requirements;
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Warn site administrator if unsafe CSS color codes are found in the database.
  */
@@ -55,3 +60,7 @@ function color_update_7001() {
     }
   }
 }
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */

modules/comment/comment.install

@@ -344,6 +344,15 @@ function comment_update_7006(&$sandbox) {
   }
 }
 
+/**
+ * @} End of "addtogroup updates-6.x-to-7.x".
+ */
+
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Add an index to the created column.
  */
@@ -371,15 +380,6 @@ function comment_update_7008() {
   db_drop_index('comment', 'nid');
 }
 
-/**
- * @} End of "addtogroup updates-6.x-to-7.x".
- */
-
-/**
- * @addtogroup updates-7.x-extra
- * @{
- */
-
 /**
  * Change the last_comment_timestamp column description.
  */

modules/field/modules/list/list.install

@@ -116,6 +116,11 @@ function _list_update_7001_extract_allowed_values($string, $position_keys) {
   return $values;
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Re-apply list_update_7001() for deleted fields.
  */
@@ -126,4 +131,8 @@ function list_update_7002() {
   // list_update_7001() has the required checks to ensure it is reentrant, so
   // it can simply be executed once more..
   list_update_7001();
-}
+}
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */

modules/forum/forum.install

@@ -351,6 +351,11 @@ function forum_update_7001() {
     ->execute();
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Add new index to forum_index table.
  */
@@ -359,11 +364,6 @@ function forum_update_7002() {
   db_add_index('forum_index', 'forum_topics', array('nid', 'tid', 'sticky', 'last_comment_timestamp'));
 }
 
-/**
- * @addtogroup updates-7.x-extra
- * @{
- */
-
 /**
  * Rename field to 'taxonomy_forums'.
  */
@@ -441,10 +441,6 @@ function forum_update_7003() {
   return $messages;
 }
 
-/**
- * @} End of "addtogroup updates-7.x-extra".
- */
-
 /**
  * Update {forum_index} so that only published nodes are indexed.
  */
@@ -465,3 +461,7 @@ function forum_update_7012() {
   db_add_index('forum_index', 'created', array('created'));
   db_add_index('forum_index', 'last_comment_timestamp', array('last_comment_timestamp'));
 }
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */

modules/image/image.install

@@ -253,6 +253,11 @@ function image_update_7000() {
   }
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Rename possibly misnamed {image_effect} table to {image_effects}.
  */
@@ -442,6 +447,10 @@ function image_update_7004() {
   }
 }
 
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */
+
 /**
  * Implements hook_requirements() to check the PHP GD Library.
  *

modules/locale/locale.install

@@ -125,14 +125,6 @@ function locale_update_7002() {
   }
 }
 
-/**
- * Update "language_count" variable.
- */
-function locale_update_7003() {
-  $languages = language_list('enabled');
-  variable_set('language_count', count($languages[1]));
-}
-
 /**
  * @} End of "addtogroup updates-6.x-to-7.x".
  */
@@ -142,6 +134,14 @@ function locale_update_7003() {
  * @{
  */
 
+/**
+ * Update "language_count" variable.
+ */
+function locale_update_7003() {
+  $languages = language_list('enabled');
+  variable_set('language_count', count($languages[1]));
+}
+
 /**
  * Remove duplicates in {locales_source}.
  */

modules/node/node.install

@@ -846,6 +846,15 @@ function node_update_7010() {
   db_create_table('block_node_type', $schema['block_node_type']);
 }
 
+/**
+ * @} End of "addtogroup updates-6.x-to-7.x".
+ */
+
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Update the database from Drupal 6 to match the schema.
  */
@@ -915,5 +924,5 @@ function node_update_7013() {
 }
 
 /**
- * @} End of "addtogroup updates-6.x-to-7.x".
+ * @} End of "addtogroup updates-7.x-extra".
  */

modules/poll/poll.install

@@ -197,6 +197,11 @@ function poll_update_7003() {
   ));
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Update the database to match the schema.
  */
@@ -204,3 +209,7 @@ function poll_update_7004() {
   // Remove field default.
   db_change_field('poll_vote', 'chid', 'chid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
 }
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */

modules/system/system.install

@@ -2952,6 +2952,16 @@ function system_update_7069() {
   variable_del('site_offline');
 }
 
+/**
+ * @} End of "defgroup updates-6.x-to-7.x".
+ * The next series of updates should start at 8000.
+ */
+
+/**
+ * @defgroup updates-7.x-extra Extra system updates for 7.x
+ * @{
+ */
+
 /**
  * Remove the obsolete 'drupal_badge_color' and 'drupal_badge_size' variables.
  */
@@ -2982,16 +2992,6 @@ function system_update_7072() {
   variable_del('site_offline_message');
 }
 
-/**
- * @} End of "defgroup updates-6.x-to-7.x".
- * The next series of updates should start at 8000.
- */
-
-/**
- * @defgroup updates-7.x-extra Extra system updates for 7.x
- * @{
- */
-
 /**
  * Add binary to {file_managed}, in case system_update_7034() was run without
  * it.

modules/trigger/trigger.install

@@ -79,6 +79,11 @@ function trigger_update_7000() {
   db_add_primary_key('trigger_assignments', array('hook', 'aid'));
 }
 
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Increase the length of the "hook" field to 78 characters.
  *
@@ -105,3 +110,7 @@ function trigger_update_7002() {
       ->execute();
   }
 }
+
+/**
+ * @} End of "addtogroup updates-7.x-extra".
+ */

modules/user/user.install

@@ -830,6 +830,15 @@ function user_update_7015() {
   ));
 }
 
+/**
+ * @} End of "addtogroup updates-6.x-to-7.x".
+ */
+
+/**
+ * @addtogroup updates-7.x-extra
+ * @{
+ */
+
 /**
  * Update the database to match the schema.
  */
@@ -890,15 +899,6 @@ function user_update_7017() {
   return $message;
 }
 
-/**
- * @} End of "addtogroup updates-6.x-to-7.x".
- */
-
-/**
- * @addtogroup updates-7.x-extra
- * @{
- */
-
 /**
  * Ensure there is an index on {users}.picture.
  */