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

4 files changed, 5 insertions, 121 deletions

diff --git a/includes/update.inc b/includes/update.inc
index c4efc1b7d..ff7fc696c 100644
--- a/includes/update.inc
+++ b/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;
           }
         }
       }
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index 1c32d58b7..6b38238e1 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -104,14 +104,6 @@ function locale_update_7001() {
 }
 
 /**
- * Allow longer javascript file names.
- *
- * Moved to update_fix_d7_requirements().
- */
-function locale_update_7002() {
-}
-
-/**
  * @} End of "defgroup updates-6.x-to-7.x"
  */
 
diff --git a/modules/system/system.install b/modules/system/system.install
index 7a5230aee..fc6ff52a9 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1864,15 +1864,6 @@ function system_update_7005() {
 }
 
 /**
- * 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.
  *
  * This update is in system.install rather than user.install so that
@@ -1899,15 +1890,6 @@ function system_update_7007() {
 }
 
 /**
- * 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.
  */
 function system_update_7009() {
@@ -1919,12 +1901,6 @@ function system_update_7009() {
 }
 
 /**
- * Moved to system_update_6048().
- */
-function system_update_7010() {
-}
-
-/**
  * Split the 'bypass node access' permission from 'administer nodes'.
  */
 function system_update_7011() {
@@ -1946,12 +1922,6 @@ function system_update_7011() {
 }
 
 /**
- * Moved to block_update_7002().
- */
-function system_update_7012() {
-}
-
-/**
  * Convert default time zone offset to default time zone name.
  */
 function system_update_7013() {
@@ -2004,12 +1974,6 @@ function system_update_7013() {
 }
 
 /**
- * Drop the bootstrap column from the {system} table. This was reverted.
- */
-function system_update_7014() {
-}
-
-/**
  * Change the user logout path.
  */
 function system_update_7015() {
@@ -2134,12 +2098,6 @@ function system_update_7027() {
 }
 
 /**
- * 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.
  */
@@ -2153,14 +2111,6 @@ function system_update_7029() {
 }
 
 /**
- * Removed in favour of Drupal 6 backport.
- *
- * @see system_update_6052()
- */
-function system_update_7031() {
-}
-
-/**
 * Alter field hostname to identifier in the {flood} table.
  */
 function system_update_7032() {
@@ -2272,13 +2222,6 @@ function system_update_7034() {
 }
 
 /**
- * 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'.
  */
 function system_update_7036() {
@@ -2310,32 +2253,6 @@ function system_update_7037() {
 }
 
 /**
- * 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.
  */
 function system_update_7042() {
@@ -2358,13 +2275,6 @@ function system_update_7042() {
 }
 
 /**
- * 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.
  */
 function system_update_7044() {
diff --git a/modules/user/user.install b/modules/user/user.install
index d75fe10f4..2eeb31764 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -548,12 +548,6 @@ function user_update_7003() {
 }
 
 /**
- * Moved to user_update_7012().
- */
-function user_update_7004() {
-}
-
-/**
  * Changes the users table to allow longer e-mail addresses.
  */
 function user_update_7005(&$sandbox) {