diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-04-10 17:30:15 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-04-10 17:30:15 +0000 |
| commit | bdb7e56143d52bb8528042591f0e8df9afde45db (patch) | |
| tree | 6801086da136619cdecfe34a94d482118f5fe4e7 /modules/system/system.module | |
| parent | e892ed5c317f7d37da09a2ad3a0e113703437b10 (diff) | |
| download | brdo-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.module')
| -rw-r--r-- | modules/system/system.module | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index f2f06bfe7..6badde7c2 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -260,7 +260,7 @@ function system_entity_info() { return array( 'file' => array( 'label' => t('File'), - 'base table' => 'file', + 'base table' => 'file_managed', 'entity keys' => array( 'id' => 'fid', ), @@ -2782,7 +2782,7 @@ function system_cron() { // Remove temporary files that are older than DRUPAL_MAXIMUM_TEMP_FILE_AGE. // Use separate placeholders for the status to avoid a bug in some versions // of PHP. See http://drupal.org/node/352956. - $result = db_query('SELECT fid FROM {file} WHERE status & :permanent1 <> :permanent2 AND timestamp < :timestamp', array( + $result = db_query('SELECT fid FROM {file_managed} WHERE status & :permanent1 <> :permanent2 AND timestamp < :timestamp', array( ':permanent1' => FILE_STATUS_PERMANENT, ':permanent2' => FILE_STATUS_PERMANENT, ':timestamp' => REQUEST_TIME - DRUPAL_MAXIMUM_TEMP_FILE_AGE |