Mercurial > defr > drupal > core
diff modules/system/system.module @ 11:589fb7c02327 6.5
Drupal 6.5
author | Franck Deroche <webmaster@defr.org> |
---|---|
date | Tue, 23 Dec 2008 14:32:19 +0100 |
parents | acef7ccb09b5 |
children | 8b6c45761e01 |
line wrap: on
line diff
--- a/modules/system/system.module Tue Dec 23 14:32:08 2008 +0100 +++ b/modules/system/system.module Tue Dec 23 14:32:19 2008 +0100 @@ -1,5 +1,5 @@ <?php -// $Id: system.module,v 1.585.2.16 2008/08/13 23:59:13 drumm Exp $ +// $Id: system.module,v 1.585.2.20 2008/10/08 20:12:18 goba Exp $ /** * @file @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.4'); +define('VERSION', '6.5'); /** * Core API compatibility. @@ -39,7 +39,7 @@ /** * Maximum age of temporary files in seconds. */ -define('DRUPAL_MAXIMUM_TEMP_FILE_AGE', 1440); +define('DRUPAL_MAXIMUM_TEMP_FILE_AGE', 21600); /** * Implementation of hook_help(). @@ -1327,7 +1327,7 @@ } $row = array(); - $instances_present = db_fetch_object(db_query("SELECT aid FROM {actions} WHERE parameters != ''")); + $instances_present = db_fetch_object(db_query("SELECT aid FROM {actions} WHERE parameters <> ''")); $header = array( array('data' => t('Action type'), 'field' => 'type'), array('data' => t('Description'), 'field' => 'description'), @@ -1431,7 +1431,7 @@ if (is_numeric($action)) { $aid = $action; // Load stored parameter values from database. - $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = %d", intval($aid))); + $data = db_fetch_object(db_query("SELECT * FROM {actions} WHERE aid = '%s'", $aid)); $edit['actions_description'] = $data->description; $edit['actions_type'] = $data->type; $function = $data->callback;