- Patch #909272 by chx: remove stub update functions and renumber the remaining ones.

includes/update.inc

@@ -992,27 +992,15 @@ function update_get_update_list() {
         continue;
       }
 
-      $last_file_name = NULL;
       $updates = drupal_map_assoc($updates);
       foreach (array_keys($updates) as $update) {
         if ($update > $schema_version) {
-          // Omit stub functions that just carry doxygen for developers.
+          // The description for an update comes from its Doxygen.
           $func = new ReflectionFunction($module . '_update_' . $update);
-          // Only read file contents once per .install file.
-          $current_file_name = $func->getFileName();
-          if ($current_file_name != $last_file_name) {
-            $file = file($current_file_name);
-            $last_file_name = $current_file_name;
-          }
-          // Slice out just the body of the function.
-          $body = array_slice($file, $func->getStartLine(), ($func->getEndLine() - $func->getStartLine()-1));
-          if (trim(implode('', $body))) {
-            // The description for an update comes from its Doxygen.
-            $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment());
-            $ret[$module]['pending'][$update] = "$update - $description";
-            if (!isset($ret[$module]['start'])) {
-              $ret[$module]['start'] = $update;
-            }
+          $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment());
+          $ret[$module]['pending'][$update] = "$update - $description";
+          if (!isset($ret[$module]['start'])) {
+            $ret[$module]['start'] = $update;
           }
         }
       }

modules/locale/locale.install

@@ -103,14 +103,6 @@ function locale_update_7001() {
   return array();
 }
 
-/**
- * Allow longer javascript file names.
- *
- * Moved to update_fix_d7_requirements().
- */
-function locale_update_7002() {
-}
-
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  */

modules/system/system.install

@@ -1863,15 +1863,6 @@ function system_update_7005() {
   variable_del('throttle_probability_limiter');
 }
 
-/**
- * Registry tables and drop the file key of the menu router, since it is no
- * longer needed.
- *
- * Moved to update_fix_d7_requirements().
- */
-function system_update_7006() {
-}
-
 /**
  * Convert to new method of storing permissions.
  *
@@ -1898,15 +1889,6 @@ function system_update_7007() {
   return implode(', ', $messages);
 }
 
-/**
- * Use the poll_choice primary key to record votes in poll_votes rather than
- * the choice order. Rename chorder to weight.
- *
- * Moved to poll_update_7001().
- */
-function system_update_7008() {
-}
-
 /**
  * Rename the variable for primary links.
  */
@@ -1918,12 +1900,6 @@ function system_update_7009() {
   }
 }
 
-/**
- * Moved to system_update_6048().
- */
-function system_update_7010() {
-}
-
 /**
  * Split the 'bypass node access' permission from 'administer nodes'.
  */
@@ -1945,12 +1921,6 @@ function system_update_7011() {
   $insert->execute();
 }
 
-/**
- * Moved to block_update_7002().
- */
-function system_update_7012() {
-}
-
 /**
  * Convert default time zone offset to default time zone name.
  */
@@ -2003,12 +1973,6 @@ function system_update_7013() {
   variable_del('date_temporary_timezone');
 }
 
-/**
- * Drop the bootstrap column from the {system} table. This was reverted.
- */
-function system_update_7014() {
-}
-
 /**
  * Change the user logout path.
  */
@@ -2133,12 +2097,6 @@ function system_update_7027() {
   module_enable($module_list, FALSE);
 }
 
-/**
- * Moved to taxonomy_update_7001().
- */
-function system_update_7028() {
-}
-
 /**
  * Add new 'view own unpublished content' permission for authenticated users.
  * Preserves legacy behavior from Drupal 6.x.
@@ -2152,14 +2110,6 @@ function system_update_7029() {
     ->execute();
 }
 
-/**
- * Removed in favour of Drupal 6 backport.
- *
- * @see system_update_6052()
- */
-function system_update_7031() {
-}
-
 /**
 * Alter field hostname to identifier in the {flood} table.
  */
@@ -2271,13 +2221,6 @@ function system_update_7034() {
   db_create_table('file_managed', $schema['file_managed']);
 }
 
-/**
- * Migrate upload module files to the new {file_managed} table.
- */
-function system_update_7035() {
-  // Update merged into system_update_7059().
-}
-
 /**
  * Split the 'access site in maintenance mode' permission from 'administer site configuration'.
  */
@@ -2309,32 +2252,6 @@ function system_update_7037() {
   db_change_field('actions', 'description', 'label', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '0'));
 }
 
-/**
- * Adds fields to the {menu_router} table to allow custom themes to be set per
- * page.
- *
- * Moved to update_fix_d7_requirements().
- */
-function system_update_7039() {
-}
-
-/**
- * Create new date format tables.
- *
- * Moved to update_fix_d7_requirements().
- */
-function system_update_7040() {
-}
-
-/**
- * Adds 'delivery_callback' field to the {menu_router} table to allow a custom
- * function to be used for final page rendering and sending to browser.
- *
- * Moved to update_fix_d7_requirements().
- */
-function system_update_7041() {
-}
-
 /**
  * Upgrade the {url_alias} table and create a cache bin for path aliases.
  */
@@ -2357,13 +2274,6 @@ function system_update_7042() {
   db_add_index('url_alias', 'alias_language_pid', array('alias', 'language', 'pid'));
 }
 
-/**
- * Add a 'context' field to {menu_router} to control contextual placement of local tasks.
- */
-function system_update_7043() {
-  // Moved to update_fix_d7_requirements().
-}
-
 /**
  * Drop the actions_aid table.
  */

modules/user/user.install

@@ -547,12 +547,6 @@ function user_update_7003() {
   }
 }
 
-/**
- * Moved to user_update_7012().
- */
-function user_update_7004() {
-}
-
 /**
  * Changes the users table to allow longer e-mail addresses.
  */