summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-12-09 16:14:26 +0000
committerDries Buytaert <dries@buytaert.net>2005-12-09 16:14:26 +0000
commit4758c8cd285b6c706c55a2d097f2003f142f4e66 (patch)
tree1d4922d726e332606d040a27b61f332e1ee8d4ba
parentc17ff754801fcd5652320e16e8dae16fcc4d4f5e (diff)
downloadbrdo-4758c8cd285b6c706c55a2d097f2003f142f4e66.tar.gz
brdo-4758c8cd285b6c706c55a2d097f2003f142f4e66.tar.bz2
- Patch #40518 by drumm: upgrade system fixes.
-rw-r--r--includes/install.inc7
-rw-r--r--update.php5
2 files changed, 8 insertions, 4 deletions
diff --git a/includes/install.inc b/includes/install.inc
index 472cc9407..c62039091 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -29,8 +29,11 @@ foreach (module_list() as $module) {
function drupal_get_schema_versions($module) {
$functions = get_defined_functions();
foreach ($functions['user'] as $function) {
- if (strpos($function, $module .'_update') === 0) {
- $updates[] = (int) substr($function, strlen($module .'_update_'));
+ if (strpos($function, $module .'_update_') === 0) {
+ $version = substr($function, strlen($module .'_update_'));
+ if (is_numeric($version)) {
+ $updates[] = $version;
+ }
}
}
if (count($updates) == 0) {
diff --git a/update.php b/update.php
index 9b16492ba..14c19e4d0 100644
--- a/update.php
+++ b/update.php
@@ -292,8 +292,9 @@ function update_selection_page() {
'#collapsed' => TRUE,
);
foreach (module_list() as $module) {
- if (module_hook($module, 'version')) {
- $updates = drupal_map_assoc(drupal_get_schema_versions($module));
+ $updates = drupal_get_schema_versions($module);
+ if ($updates !== FALSE) {
+ $updates = drupal_map_assoc($updates);
$updates[] = 'No updates available';
$form['start'][$module] = array(