Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #440826 by brianV: whitespace clean-up.

merge-requests/26/head
Dries Buytaert 2009-04-25 13:47:15 +00:00
parent 598dc48357
commit 453d7c566e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/system/system.module
View File

@ -1562,8 +1562,8 @@ function system_cron() {
// Remove temporary files that are older than DRUPAL_MAXIMUM_TEMP_FILE_AGE. // 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 // Use separate placeholders for the status to avoid a bug in some versions
// of PHP. @see http://drupal.org/node/352956 // of PHP. See http://drupal.org/node/352956
$result = db_query('SELECT fid FROM {files} WHERE status & :permanent1 != :permanent2 AND timestamp < :timestamp', array(':permanent1' => FILE_STATUS_PERMANENT, ':permanent2' => FILE_STATUS_PERMANENT, ':timestamp' => REQUEST_TIME - DRUPAL_MAXIMUM_TEMP_FILE_AGE)); $result = db_query('SELECT fid FROM {files} WHERE status & :permanent1 <> :permanent2 AND timestamp < :timestamp', array(':permanent1' => FILE_STATUS_PERMANENT, ':permanent2' => FILE_STATUS_PERMANENT, ':timestamp' => REQUEST_TIME - DRUPAL_MAXIMUM_TEMP_FILE_AGE));
foreach ($result as $row) { foreach ($result as $row) {
if ($file = file_load($row->fid)) { if ($file = file_load($row->fid)) {
if (!file_delete($file)) { if (!file_delete($file)) {
@ -1827,7 +1827,7 @@ function system_actions_configure($form_state, $action = NULL) {
function system_actions_configure_validate($form, $form_state) { function system_actions_configure_validate($form, $form_state) {
$function = actions_function_lookup($form_state['values']['actions_action']) . '_validate'; $function = actions_function_lookup($form_state['values']['actions_action']) . '_validate';
// Hand off validation to the action. // Hand off validation to the action.
if (function_exists($function)) { if (drupal_function_exists($function)) {
$function($form, $form_state); $function($form, $form_state);
} }
} }