diff --git a/file_entity.admin.inc b/file_entity.admin.inc index 7b05458..9b1a9d2 100644 --- a/file_entity.admin.inc +++ b/file_entity.admin.inc @@ -490,12 +490,21 @@ function file_entity_multiple_delete_confirm($form, &$form_state, $files) { $form['files'] = array('#prefix' => '', '#tree' => TRUE); // array_filter returns only elements with TRUE values foreach ($files as $fid => $value) { - $filename = db_query('SELECT filename FROM {file_managed} WHERE fid = :fid', array(':fid' => $fid))->fetchField(); + $file = file_load($fid); + $usage = file_usage_list($file); + if (!empty($usage)) { + $files_have_usage = TRUE; + $filename = t("@title (in use)", array('@title' => $file->filename, '@url' => url('file/' . $fid . '/usage'))); + } + else { + $filename = check_plain($file->filename); + } + $form['files'][$fid] = array( '#type' => 'hidden', '#value' => $fid, '#prefix' => '
  • ', - '#suffix' => check_plain($filename) . "
  • \n", + '#suffix' => $filename . "\n", ); } $form['operation'] = array('#type' => 'hidden', '#value' => 'delete'); diff --git a/file_entity.pages.inc b/file_entity.pages.inc index 9e8481f..6af8fe2 100644 --- a/file_entity.pages.inc +++ b/file_entity.pages.inc @@ -721,7 +721,7 @@ function file_entity_multiple_delete_form($form, &$form_state, array $files) { $usage = file_usage_list($file); if (!empty($usage)) { $files_have_usage = TRUE; - $title = t('@title (in use)', array('@title' => $title)); + $title = t("@title (in use)", array('@title' => $file->filename, '@url' => url('file/' . $fid . '/usage'))); } else { $title = check_plain($title);