diff --git a/modules/system.module b/modules/system.module index 69b83175245f515792e0c0c86065932082a44b20..56e54885d3ca5572a64d718b2ab5d12f78f8c4db 100644 --- a/modules/system.module +++ b/modules/system.module @@ -354,22 +354,15 @@ function system_view_general() { '#description' => t('If you want any sort of access control on the downloading of files, this needs to be set to <em>private</em>. You can change this at any time, however all download URLs will change and there may be unexpected problems so it is not recommended.') ); - /* // Image handling: - $group = array(); $toolkits_available = image_get_available_toolkits(); if (count($toolkits_available) > 1) { - $group['image_toolkit'] = array( + $form['image'] = array('#type' => 'fieldset', '#title' => t('Image handling'), '#collapsible' => TRUE, '#collapsed' => true); + $form['image']['image_toolkit'] = array( '#type' => 'radios', '#title' => t('Select an image processing toolkit'), '#default_value' => variable_get('image_toolkit', image_get_toolkit()), '#options' => $toolkits_available ); } - $group['toolkit'] = image_toolkit_invoke('settings'); - if (is_array($group)) { - $form['image'] = array('#type' => 'fieldset', '#title' => t('Image handling'), '#collapsible' => TRUE, '#collapsed' => true); - $form['image'] = array_merge($form['image'], $group); - } - */ // Feed settings $form['feed'] = array('#type' => 'fieldset', '#title' => t('RSS feed settings'), '#collapsible' => TRUE, '#collapsed' => TRUE); diff --git a/modules/system/system.module b/modules/system/system.module index 69b83175245f515792e0c0c86065932082a44b20..56e54885d3ca5572a64d718b2ab5d12f78f8c4db 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -354,22 +354,15 @@ function system_view_general() { '#description' => t('If you want any sort of access control on the downloading of files, this needs to be set to <em>private</em>. You can change this at any time, however all download URLs will change and there may be unexpected problems so it is not recommended.') ); - /* // Image handling: - $group = array(); $toolkits_available = image_get_available_toolkits(); if (count($toolkits_available) > 1) { - $group['image_toolkit'] = array( + $form['image'] = array('#type' => 'fieldset', '#title' => t('Image handling'), '#collapsible' => TRUE, '#collapsed' => true); + $form['image']['image_toolkit'] = array( '#type' => 'radios', '#title' => t('Select an image processing toolkit'), '#default_value' => variable_get('image_toolkit', image_get_toolkit()), '#options' => $toolkits_available ); } - $group['toolkit'] = image_toolkit_invoke('settings'); - if (is_array($group)) { - $form['image'] = array('#type' => 'fieldset', '#title' => t('Image handling'), '#collapsible' => TRUE, '#collapsed' => true); - $form['image'] = array_merge($form['image'], $group); - } - */ // Feed settings $form['feed'] = array('#type' => 'fieldset', '#title' => t('RSS feed settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);