summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/image.gd.inc4
-rw-r--r--modules/system/system.admin.inc4
-rw-r--r--modules/system/system.install30
-rw-r--r--modules/system/system.module160
4 files changed, 56 insertions, 142 deletions
diff --git a/modules/system/image.gd.inc b/modules/system/image.gd.inc
index 23e34677b..706395439 100644
--- a/modules/system/image.gd.inc
+++ b/modules/system/image.gd.inc
@@ -118,7 +118,7 @@ function image_gd_resize(stdClass $image, $width, $height) {
*/
function image_gd_rotate(stdClass $image, $degrees, $background = NULL) {
// PHP installations using non-bundled GD do not have imagerotate.
- if (!function_exists('imagerotate')) {
+ if (!drupal_function_exists('imagerotate')) {
watchdog('image', 'The image %file could not be rotated because the imagerotate() function is not available in this PHP installation.', array('%file' => $image->source));
return FALSE;
}
@@ -215,7 +215,7 @@ function image_gd_crop(stdClass $image, $x, $y, $width, $height) {
*/
function image_gd_desaturate(stdClass $image) {
// PHP installations using non-bundled GD do not have imagefilter.
- if (!function_exists('imagefilter')) {
+ if (!drupal_function_exists('imagefilter')) {
watchdog('image', 'The image %file could not be desaturated because the imagefilter() function is not available in this PHP installation.', array('%file' => $image->source));
return FALSE;
}
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index e3926043e..f80d2a8fc 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -52,7 +52,7 @@ function system_main_admin_page($arg = NULL) {
$block['show'] = TRUE;
if (empty($content)) {
// If no items found below, but access checks did not fail, show.
- $block['title'] = l($item['title'], $item['href'], $item['localized_options']);
+ $block['title'] = l($item['title'], $item['href'], $item['localized_options']);
}
else {
// Theme items below.
@@ -1552,7 +1552,7 @@ function system_image_toolkit_settings() {
// Get the toolkit's settings form.
$function = 'image_' . $current_toolkit . '_settings';
- if (function_exists($function)) {
+ if (drupal_function_exists($function)) {
$form['image_toolkit_settings'] = $function();
}
diff --git a/modules/system/system.install b/modules/system/system.install
index df678015a..d8c2e5e65 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -44,7 +44,7 @@ function system_requirements($phase) {
'severity' => REQUIREMENT_INFO,
'weight' => -9
);
- }
+ }
}
// Web server information.
@@ -953,11 +953,6 @@ function system_schema() {
'not null' => TRUE,
'default' => 0,
),
- 'file' => array(
- 'description' => 'The file to include for this element, usually the page callback function lives in this file.',
- 'type' => 'text',
- 'size' => 'medium'
- ),
),
'indexes' => array(
'fit' => array('fit'),
@@ -1242,6 +1237,13 @@ function system_schema() {
'not null' => TRUE,
'default' => ''
),
+ 'suffix' => array(
+ 'description' => "The part of the function name after the module, which is the hook this function implements, if any.",
+ 'type' => 'varchar',
+ 'length' => 68,
+ 'not null' => TRUE,
+ 'default' => ''
+ ),
'weight' => array(
'description' => "The order in which this module's hooks should be invoked relative to other modules. Equal-weighted modules are ordered by name.",
'type' => 'int',
@@ -1251,7 +1253,7 @@ function system_schema() {
),
'primary key' => array('name', 'type'),
'indexes' => array(
- 'hook' => array('type', 'weight', 'module'),
+ 'hook' => array('type', 'suffix', 'weight', 'module'),
),
);
@@ -1397,12 +1399,6 @@ function system_schema() {
'not null' => TRUE,
'default' => 0,
),
- 'bootstrap' => array(
- 'description' => "Boolean indicating whether this module is loaded during Drupal's early bootstrapping phase (e.g. even before the page cache is consulted).",
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- ),
'schema_version' => array(
'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
'type' => 'int',
@@ -1425,7 +1421,6 @@ function system_schema() {
'primary key' => array('filename'),
'indexes' => array(
'modules' => array('type', 'status', 'weight', 'name'),
- 'bootstrap' => array('type', 'status', 'bootstrap', 'weight', 'name'),
'type_name' => array('type', 'name'),
),
);
@@ -1716,17 +1711,19 @@ function system_update_7005() {
*/
function system_update_7006() {
$ret = array();
+ db_drop_field($ret, 'menu_router', 'file');
$schema['registry'] = array(
'fields' => array(
'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
'type' => array('type' => 'varchar', 'length' => 9, 'not null' => TRUE, 'default' => ''),
'filename' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
'module' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => ''),
+ 'suffix' => array('type' => 'varchar', 'length' => 68, 'not null' => TRUE, 'default' => ''),
'weight' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
),
'primary key' => array('name', 'type'),
'indexes' => array(
- 'hook' => array('type', 'weight', 'module'),
+ 'hook' => array('type', 'suffix', 'weight', 'module'),
),
);
$schema['registry_file'] = array(
@@ -1922,10 +1919,11 @@ function system_update_7013() {
}
/**
- * Drop the bootstrap column from the {system} table. This was reverted.
+ * Drop the bootstrap column from the {system} table.
*/
function system_update_7014() {
$ret = array();
+ db_drop_field($ret, 'system', 'bootstrap');
return $ret;
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 0d01643ee..c304bf061 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -501,22 +501,18 @@ function system_menu() {
'page callback' => 'ajax_form_callback',
'access callback' => TRUE,
'type' => MENU_CALLBACK,
- 'file path' => 'includes',
- 'file' => 'form.inc',
);
$items['system/timezone'] = array(
'title' => 'Time zone',
'page callback' => 'system_timezone',
'access callback' => TRUE,
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['system/run-cron-image'] = array(
'title' => 'Execute cron',
'page callback' => 'system_run_cron_image',
'access callback' => 'system_run_cron_image_access',
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin'] = array(
'title' => 'Administer',
@@ -524,21 +520,18 @@ function system_menu() {
'page callback' => 'system_main_admin_page',
'weight' => 9,
'menu_name' => 'management',
- 'file' => 'system.admin.inc',
);
$items['admin/compact'] = array(
'title' => 'Compact mode',
'page callback' => 'system_admin_compact_page',
'access arguments' => array('access administration pages'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin/by-task'] = array(
'title' => 'By task',
'page callback' => 'system_main_admin_page',
'access arguments' => array('access administration pages'),
'type' => MENU_DEFAULT_LOCAL_TASK,
- 'file' => 'system.admin.inc',
);
$items['admin/by-module'] = array(
'title' => 'By module',
@@ -546,7 +539,6 @@ function system_menu() {
'access arguments' => array('access administration pages'),
'type' => MENU_LOCAL_TASK,
'weight' => 2,
- 'file' => 'system.admin.inc',
);
// Menu items that are basically just menu blocks.
@@ -558,7 +550,6 @@ function system_menu() {
'page callback' => 'system_settings_overview',
'access callback' => 'system_admin_menu_block_access',
'access arguments' => array('admin/settings', 'access administration pages'),
- 'file' => 'system.admin.inc',
);
$items['admin/structure'] = array(
'title' => 'Structure',
@@ -568,7 +559,6 @@ function system_menu() {
'page callback' => 'system_admin_menu_block_page',
'access callback' => 'system_admin_menu_block_access',
'access arguments' => array('admin/structure', 'access administration pages'),
- 'file' => 'system.admin.inc',
);
// Appearance.
$items['admin/appearance'] = array(
@@ -579,21 +569,18 @@ function system_menu() {
'access arguments' => array('administer site configuration'),
'position' => 'left',
'weight' => -6,
- 'file' => 'system.admin.inc',
);
$items['admin/appearance/select'] = array(
'title' => 'List',
'description' => 'Select the default theme for your site.',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -1,
- 'file' => 'system.admin.inc',
);
$items['admin/appearance/settings'] = array(
'title' => 'Configure',
'page arguments' => array('system_theme_settings'),
'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_TASK,
- 'file' => 'system.admin.inc',
);
// Theme configuration subtabs.
$items['admin/appearance/settings/global'] = array(
@@ -609,7 +596,6 @@ function system_menu() {
'type' => MENU_LOCAL_TASK,
'access callback' => '_system_themes_access',
'access arguments' => array($theme),
- 'file' => 'system.admin.inc',
);
}
@@ -618,14 +604,12 @@ function system_menu() {
'title' => 'Configuration and modules',
'page callback' => 'system_admin_config_page',
'access arguments' => array('access administration pages'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/config'] = array(
'title' => 'Configuration',
'access arguments' => array('administer site configuration'),
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
- 'file' => 'system.admin.inc',
);
$items['admin/config/modules'] = array(
'title' => 'Modules',
@@ -633,7 +617,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_modules'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
'type' => MENU_LOCAL_TASK,
'weight' => 10,
);
@@ -651,25 +634,11 @@ function system_menu() {
'page arguments' => array('system_modules_uninstall'),
'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_TASK,
- 'file' => 'system.admin.inc',
);
$items['admin/config/modules/uninstall/confirm'] = array(
'title' => 'Uninstall',
'access arguments' => array('administer site configuration'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
- );
-
- // Development menu category.
- $items['admin/development'] = array(
- 'title' => 'Development',
- 'description' => 'Development tools.',
- 'position' => 'right',
- 'weight' => -7,
- 'page callback' => 'system_admin_menu_block_page',
- 'access callback' => 'system_admin_menu_block_access',
- 'access arguments' => array('admin/development', 'access administration pages'),
- 'file' => 'system.admin.inc',
);
// Actions.
@@ -677,8 +646,7 @@ function system_menu() {
'title' => 'Actions',
'description' => 'Manage the actions defined for your site.',
'access arguments' => array('administer actions'),
- 'page callback' => 'system_actions_manage',
- 'file' => 'system.admin.inc',
+ 'page callback' => 'system_actions_manage'
);
$items['admin/settings/actions/manage'] = array(
'title' => 'Manage actions',
@@ -686,7 +654,6 @@ function system_menu() {
'page callback' => 'system_actions_manage',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -2,
- 'file' => 'system.admin.inc',
);
$items['admin/settings/actions/configure'] = array(
'title' => 'Configure an advanced action',
@@ -694,7 +661,6 @@ function system_menu() {
'page arguments' => array('system_actions_configure'),
'access arguments' => array('administer actions'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin/settings/actions/delete/%actions'] = array(
'title' => 'Delete action',
@@ -703,14 +669,12 @@ function system_menu() {
'page arguments' => array('system_actions_delete_form', 4),
'access arguments' => array('administer actions'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin/settings/actions/orphan'] = array(
'title' => 'Remove orphans',
'page callback' => 'system_actions_remove_orphans',
'access arguments' => array('administer actions'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
// IP address blocking.
@@ -719,7 +683,6 @@ function system_menu() {
'description' => 'Manage blocked IP addresses.',
'page callback' => 'system_ip_blocking',
'access arguments' => array('block IP addresses'),
- 'file' => 'system.admin.inc',
);
$items['admin/settings/ip-blocking/%'] = array(
'title' => 'IP address blocking',
@@ -727,7 +690,6 @@ function system_menu() {
'page callback' => 'system_ip_blocking',
'access arguments' => array('block IP addresses'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin/settings/ip-blocking/delete/%blocked_ip'] = array(
'title' => 'Delete IP address',
@@ -735,19 +697,17 @@ function system_menu() {
'page arguments' => array('system_ip_blocking_delete', 4),
'access arguments' => array('block IP addresses'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
// Configuration.
$items['admin/config/development'] = array(
- 'title' => 'Development',
- 'description' => 'Development tools.',
- 'position' => 'left',
- 'weight' => 10,
- 'page callback' => 'system_admin_menu_block_page',
- 'access callback' => 'system_admin_menu_block_access',
- 'access arguments' => array('admin/config/development', 'access administration pages'),
- 'file' => 'system.admin.inc',
+ 'title' => 'Development',
+ 'description' => 'Development tools.',
+ 'position' => 'left',
+ 'weight' => 10,
+ 'page callback' => 'system_admin_menu_block_page',
+ 'access callback' => 'system_admin_menu_block_access',
+ 'access arguments' => array('admin/config/development', 'access administration pages'),
);
$items['admin/config/development/maintenance'] = array(
'title' => 'Maintenance mode',
@@ -755,7 +715,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_site_maintenance_mode'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/development/performance'] = array(
'title' => 'Performance',
@@ -763,17 +722,15 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_performance_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/media'] = array(
- 'title' => 'Media',
- 'description' => 'Media tools.',
- 'position' => 'left',
- 'weight' => 10,
- 'page callback' => 'system_admin_menu_block_page',
- 'access callback' => 'system_admin_menu_block_access',
- 'access arguments' => array('admin/config/media', 'access administration pages'),
- 'file' => 'system.admin.inc',
+ 'title' => 'Media',
+ 'description' => 'Media tools.',
+ 'position' => 'left',
+ 'weight' => 10,
+ 'page callback' => 'system_admin_menu_block_page',
+ 'access callback' => 'system_admin_menu_block_access',
+ 'access arguments' => array('admin/config/media', 'access administration pages'),
);
$items['admin/config/media/file-system'] = array(
'title' => 'File system',
@@ -781,7 +738,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_file_system_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/media/image-toolkit'] = array(
'title' => 'Image toolkit',
@@ -789,15 +745,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_image_toolkit_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
- );
- $items['admin/settings/performance'] = array(
- 'title' => 'Performance',
- 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.',
- 'page callback' => 'drupal_get_form',
- 'page arguments' => array('system_performance_settings'),
- 'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/development/logging'] = array(
'title' => 'Logging and errors',
@@ -805,17 +752,15 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_logging_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/config/regional'] = array(
- 'title' => 'Regional and language',
- 'description' => 'Regional settings, localization and translation.',
- 'position' => 'left',
- 'weight' => -7,
- 'page callback' => 'system_admin_menu_block_page',
- 'access callback' => 'system_admin_menu_block_access',
- 'access arguments' => array('admin/config/regional', 'access administration pages'),
- 'file' => 'system.admin.inc',
+ 'title' => 'Regional and language',
+ 'description' => 'Regional settings, localization and translation.',
+ 'position' => 'left',
+ 'weight' => -7,
+ 'page callback' => 'system_admin_menu_block_page',
+ 'access callback' => 'system_admin_menu_block_access',
+ 'access arguments' => array('admin/config/regional', 'access administration pages'),
);
$items['admin/config/regional/settings'] = array(
'title' => 'Regional settings',
@@ -824,16 +769,14 @@ function system_menu() {
'page arguments' => array('system_regional_settings'),
'access arguments' => array('administer site configuration'),
'weight' => -10,
- 'file' => 'system.admin.inc',
);
$items['admin/config/regional/settings/lookup'] = array(
'title' => 'Date and time lookup',
'type' => MENU_CALLBACK,
'page callback' => 'system_date_time_lookup',
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
-
+
// Settings.
$items['admin/settings/site-information'] = array(
'title' => 'Site information',
@@ -841,7 +784,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_site_information_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/settings/rss-publishing'] = array(
'title' => 'RSS publishing',
@@ -849,7 +791,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_rss_feeds_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/settings/clean-urls'] = array(
'title' => 'Clean URLs',
@@ -857,7 +798,6 @@ function system_menu() {
'page callback' => 'drupal_get_form',
'page arguments' => array('system_clean_url_settings'),
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/settings/clean-urls/check'] = array(
'title' => 'Clean URL check',
@@ -865,7 +805,6 @@ function system_menu() {
'page arguments' => array(array('status' => TRUE)),
'access callback' => TRUE,
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
// Reports.
@@ -877,7 +816,6 @@ function system_menu() {
'access arguments' => array('admin/reports', 'access site reports'),
'weight' => 5,
'position' => 'left',
- 'file' => 'system.admin.inc',
);
$items['admin/reports/status'] = array(
'title' => 'Status report',
@@ -885,28 +823,24 @@ function system_menu() {
'page callback' => 'system_status',
'weight' => 10,
'access arguments' => array('administer site configuration'),
- 'file' => 'system.admin.inc',
);
$items['admin/reports/status/run-cron'] = array(
'title' => 'Run cron',
'page callback' => 'system_run_cron',
'access arguments' => array('administer site configuration'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
$items['admin/reports/status/php'] = array(
'title' => 'PHP',
'page callback' => 'system_php',
'access arguments' => array('administer site configuration'),
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
// Default page for batch operations.
$items['batch'] = array(
'page callback' => 'system_batch_page',
'access callback' => TRUE,
'type' => MENU_CALLBACK,
- 'file' => 'system.admin.inc',
);
return $items;
}
@@ -1341,7 +1275,7 @@ function system_filetransfer_backends() {
'weight' => 0,
);
}
-
+
if (ini_get('allow_url_fopen')) {
$backends['ftp_wrapper'] = array(
'title' => t('FTP using file streams'),
@@ -1350,7 +1284,7 @@ function system_filetransfer_backends() {
'weight' => 10,
);
}
-
+
// SSH2 lib connection is only available if the proper PHP extension is
// installed.
if (function_exists('ssh2_connect')) {
@@ -1376,7 +1310,7 @@ function system_filetransfer_backends() {
function system_get_filetransfer_settings_form($filetransfer_backend_name, $defaults) {
$available_backends = module_invoke_all('filetransfer_backends');
$form = call_user_func($available_backends[$filetransfer_backend_name]['settings_form']);
-
+
foreach ($form as $name => &$element) {
if (isset($defaults[$name])) {
$element['#default_value'] = $defaults[$name];
@@ -1408,30 +1342,30 @@ function system_filetransfer_backend_form_ssh() {
*/
function _system_filetransfer_backend_form_common() {
$form = array();
-
+
$form['hostname'] = array (
'#type' => 'textfield',
'#title' => t('Host'),
'#default_value' => 'localhost',
);
-
+
$form['port'] = array (
'#type' => 'textfield',
'#title' => t('Port'),
'#default_value' => NULL,
);
-
+
$form['username'] = array (
'#type' => 'textfield',
'#title' => t('Username'),
);
-
+
$form['password'] = array (
'#type' => 'password',
'#title' => t('Password'),
'#description' => t('This is not saved in the database and is only used to test the connection'),
);
-
+
return $form;
}
@@ -1710,7 +1644,7 @@ function system_admin_menu_block($item) {
*/
function system_check_directory($form_element) {
$directory = $form_element['#value'];
-
+
if (!is_dir($directory) && !drupal_mkdir($directory, NULL, TRUE)) {
// If the directory does not exists and cannot be created.
form_set_error($form_element['#parents'][0], t('The directory %directory does not exist and could not be created.', array('%directory' => $directory)));
@@ -1867,7 +1801,6 @@ function _system_get_module_data() {
'version' => NULL,
'php' => DRUPAL_MINIMUM_PHP,
'files' => array(),
- 'bootstrap' => 0,
);
// Read info files for each module.
@@ -1906,22 +1839,6 @@ function system_get_module_data() {
ksort($modules);
system_get_files_database($modules, 'module');
system_update_files_database($modules, 'module');
- // Refresh bootstrap status.
- $bootstrap_modules = array();
- foreach (bootstrap_hooks() as $hook) {
- foreach (module_implements($hook) as $module) {
- $bootstrap_modules[] = $module;
- }
- }
- $query = db_update('system')->fields(array('bootstrap' => 0));
- if ($bootstrap_modules) {
- db_update('system')
- ->fields(array('bootstrap' => 1))
- ->condition('name', $bootstrap_modules, 'IN')
- ->execute();
- $query->condition('name', $bootstrap_modules, 'NOT IN');
- }
- $query->execute();
$modules = _module_build_dependencies($modules);
return $modules;
}
@@ -2671,7 +2588,7 @@ function system_actions_configure($form_state, $action = NULL) {
function system_actions_configure_validate($form, $form_state) {
$function = actions_function_lookup($form_state['values']['actions_action']) . '_validate';
// Hand off validation to the action.
- if (function_exists($function)) {
+ if (drupal_function_exists($function)) {
$function($form, $form_state);
}
}
@@ -2831,7 +2748,7 @@ function system_send_email_action($object, $context) {
}
$recipient = token_replace($context['recipient'], $context);
-
+
$language = user_preferred_language($account);
$params = array('context' => $context);
@@ -3024,11 +2941,10 @@ function theme_meta_generator_header($version = VERSION) {
* Implement hook_image_toolkits().
*/
function system_image_toolkits() {
- include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc';
return array(
'gd' => array(
'title' => t('GD2 image manipulation toolkit'),
- 'available' => function_exists('image_gd_check_settings') && image_gd_check_settings(),
+ 'available' => drupal_function_exists('image_gd_check_settings') && image_gd_check_settings(),
),
);
}
@@ -3056,18 +2972,18 @@ function system_retrieve_file($url, $destination = NULL, $overwrite = TRUE) {
}
$parsed_url = parse_url($url);
$local = is_dir(file_directory_path() . '/' . $destination) ? $destination . '/' . basename($parsed_url['path']) : $destination;
-
+
if (!$overwrite && file_exists($local)) {
drupal_set_message(t('@remote could not be saved. @local already exists', array('@remote' => $url, '@local' => $local)), 'error');
return FALSE;
}
-
+
$result = drupal_http_request($url);
if ($result->code != 200 || !file_save_data($result->data, $local)) {
drupal_set_message(t('@remote could not be saved.', array('@remote' => $url)), 'error');
return FALSE;
}
-
+
return $local;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 11:10:32 +0000