From f8d634e38a776769a0ee9b2f6fe6d87cf778ef6a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 21 Mar 2005 21:25:49 +0000
Subject: [PATCH] - Patch #18093 by Junyor: clean up handling of image toolkit
 code in absence of   any toolkits.

---
 modules/system.module        | 8 +++++---
 modules/system/system.module | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/system.module b/modules/system.module
index f9ed7725429..e3c5b5ecdb2 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -242,12 +242,14 @@ function system_view_general() {
   $toolkits_available = image_get_available_toolkits();
   if (count($toolkits_available) > 1) {
     $group .= form_radios(t('Select an image processing toolkit'), 'image_toolkit', variable_get('image_toolkit', image_get_toolkit()), $toolkits_available);
+    $group .= image_toolkit_invoke('settings');
   }
-  $group .= image_toolkit_invoke('settings');
-  if ($group) {
-    $output .= form_group(t('Image handling'), $group);
+  else {
+    $group .= t('<p>No image toolkits are installed.</p>');
   }
 
+  $output .= form_group(t('Image handling'), $group);
+
   // date settings:
   $zones = _system_zonelist();
 
diff --git a/modules/system/system.module b/modules/system/system.module
index f9ed7725429..e3c5b5ecdb2 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -242,12 +242,14 @@ function system_view_general() {
   $toolkits_available = image_get_available_toolkits();
   if (count($toolkits_available) > 1) {
     $group .= form_radios(t('Select an image processing toolkit'), 'image_toolkit', variable_get('image_toolkit', image_get_toolkit()), $toolkits_available);
+    $group .= image_toolkit_invoke('settings');
   }
-  $group .= image_toolkit_invoke('settings');
-  if ($group) {
-    $output .= form_group(t('Image handling'), $group);
+  else {
+    $group .= t('<p>No image toolkits are installed.</p>');
   }
 
+  $output .= form_group(t('Image handling'), $group);
+
   // date settings:
   $zones = _system_zonelist();