From bdb7e56143d52bb8528042591f0e8df9afde45db Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 10 Apr 2010 17:30:15 +0000 Subject: - Patch #741578 by nikgregory, andypost, Berdir, noahb: 'File' is a reserved word that should not be used. --- modules/system/system.module | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/system/system.module') 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 -- cgit v1.2.3