diff options
Diffstat (limited to 'modules/update')
| -rw-r--r-- | modules/update/update.manager.inc | 2 | ||||
| -rw-r--r-- | modules/update/update.module | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc index 59858ebe8..d9fd86ff2 100644 --- a/modules/update/update.manager.inc +++ b/modules/update/update.manager.inc @@ -816,7 +816,7 @@ function update_manager_file_get($url) { // Check the cache and download the file if needed. $cache_directory = _update_manager_cache_directory(); - $local = $cache_directory . '/' . basename($parsed_url['path']); + $local = $cache_directory . '/' . drupal_basename($parsed_url['path']); if (!file_exists($local) || update_delete_file_if_stale($local)) { return system_retrieve_file($url, $local, FALSE, FILE_EXISTS_REPLACE); diff --git a/modules/update/update.module b/modules/update/update.module index a2d705a0e..293a53d90 100644 --- a/modules/update/update.module +++ b/modules/update/update.module @@ -695,14 +695,14 @@ function update_verify_update_archive($project, $archive_file, $directory) { } if (empty($files)) { - $errors[] = t('%archive_file does not contain any .info files.', array('%archive_file' => basename($archive_file))); + $errors[] = t('%archive_file does not contain any .info files.', array('%archive_file' => drupal_basename($archive_file))); } elseif (!$compatible_project) { $errors[] = format_plural( count($incompatible), '%archive_file contains a version of %names that is not compatible with Drupal !version.', '%archive_file contains versions of modules or themes that are not compatible with Drupal !version: %names', - array('!version' => DRUPAL_CORE_COMPATIBILITY, '%archive_file' => basename($archive_file), '%names' => implode(', ', $incompatible)) + array('!version' => DRUPAL_CORE_COMPATIBILITY, '%archive_file' => drupal_basename($archive_file), '%names' => implode(', ', $incompatible)) ); } |