From 8ae6dc4b2ecaa669e061aac7879435be01021c33 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sun, 2 Jan 2011 23:28:16 +0000 Subject: #936490 by dww, fago: Fixed Update module should verify downloaded tarballs and propagate errors correctly --- modules/update/update.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/update') diff --git a/modules/update/update.module b/modules/update/update.module index 8891a5067..a4a4c3e8c 100644 --- a/modules/update/update.module +++ b/modules/update/update.module @@ -696,14 +696,14 @@ function update_verify_update_archive($project, $archive_file, $directory) { // Parse all the .info files and make sure they're compatible with this // version of Drupal core. $incompatible = array(); - $files = file_scan_directory("$directory/$project", '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info/', array('key' => 'name', 'min_depth' => 0)); + $files = file_scan_directory("$directory/$project", '/^' . DRUPAL_PHP_FUNCTION_PATTERN . '\.info$/', array('key' => 'name', 'min_depth' => 0)); foreach ($files as $key => $file) { // Get the .info file for the module or theme this file belongs to. $info = drupal_parse_info_file($file->uri); // If the module or theme is incompatible with Drupal core, set an error. if (empty($info['core']) || $info['core'] != DRUPAL_CORE_COMPATIBILITY) { - $incompatible[] = $info['name']; + $incompatible[] = !empty($info['name']) ? $info['name'] : t('Unknown'); } } if (!empty($incompatible)) { -- cgit v1.2.3