From 84d4e12ccc8fcfd1cc0109ecd33acded2249fc64 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 26 Feb 2006 19:37:18 +0000
Subject: [PATCH] - Patch #50078 by merlinofchaos: made image toolkits work
 again.

---
 modules/system.module        | 11 ++---------
 modules/system/system.module | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/system.module b/modules/system.module
index 69b8317524..56e54885d3 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 69b8317524..56e54885d3 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);
-- 
GitLab