summaryrefslogtreecommitdiff
path: root/modules/system/system.api.php
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-04-10 17:30:15 +0000
committerDries Buytaert <dries@buytaert.net>2010-04-10 17:30:15 +0000
commitbdb7e56143d52bb8528042591f0e8df9afde45db (patch)
tree6801086da136619cdecfe34a94d482118f5fe4e7 /modules/system/system.api.php
parente892ed5c317f7d37da09a2ad3a0e113703437b10 (diff)
downloadbrdo-bdb7e56143d52bb8528042591f0e8df9afde45db.tar.gz
brdo-bdb7e56143d52bb8528042591f0e8df9afde45db.tar.bz2
- Patch #741578 by nikgregory, andypost, Berdir, noahb: 'File' is a reserved word that should not be used.
Diffstat (limited to 'modules/system/system.api.php')
-rw-r--r--modules/system/system.api.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index b188e871b..fff543ad4 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -1783,7 +1783,7 @@ function hook_file_download($uri) {
if (!file_prepare_directory($uri)) {
$uri = FALSE;
}
- $result = db_query("SELECT f.* FROM {file} f INNER JOIN {upload} u ON f.fid = u.fid WHERE uri = :uri", array('uri' => $uri));
+ $result = db_query("SELECT f.* FROM {file_managed} f INNER JOIN {upload} u ON f.fid = u.fid WHERE uri = :uri", array('uri' => $uri));
foreach ($result as $file) {
if (!user_access('view uploaded files')) {
return -1;