From f77b582fb1d93bf46642ebe08879f3fed3e95f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Mon, 28 Sep 2009 13:22:02 +0000 Subject: [PATCH] #499828 by Darren Oh, Dave Reid, dww: Wrong release dates were recorded on multi-module projects if deployed from CVS --- modules/update/update.compare.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/update/update.compare.inc b/modules/update/update.compare.inc index e391fb0d4bb..354bd37bc88 100644 --- a/modules/update/update.compare.inc +++ b/modules/update/update.compare.inc @@ -84,6 +84,10 @@ function _update_process_info_list(&$projects, $list, $project_type) { $file->info['_info_file_ctime'] = filectime($info_filename); } + if (!isset($file->info['datestamp'])) { + $file->info['datestamp'] = 0; + } + $project_name = $file->info['project']; if (!isset($projects[$project_name])) { // Only process this if we haven't done this project, since a single @@ -91,7 +95,7 @@ function _update_process_info_list(&$projects, $list, $project_type) { $projects[$project_name] = array( 'name' => $project_name, 'info' => $file->info, - 'datestamp' => isset($file->info['datestamp']) ? $file->info['datestamp'] : 0, + 'datestamp' => $file->info['datestamp'], 'includes' => array($file->name => $file->info['name']), 'project_type' => $project_name == 'drupal' ? 'core' : $project_type, ); @@ -99,6 +103,7 @@ function _update_process_info_list(&$projects, $list, $project_type) { else { $projects[$project_name]['includes'][$file->name] = $file->info['name']; $projects[$project_name]['info']['_info_file_ctime'] = max($projects[$project_name]['info']['_info_file_ctime'], $file->info['_info_file_ctime']); + $projects[$project_name]['datestamp'] = max($projects[$project_name]['datestamp'], $file->info['datestamp']); } } }