diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-03-21 21:25:49 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-03-21 21:25:49 +0000 |
| commit | f8d634e38a776769a0ee9b2f6fe6d87cf778ef6a (patch) | |
| tree | 222c9ce6c8bff20f3ed0f77ff1bfe7908489c5ff /modules | |
| parent | 77a5d783f207e586fa62df6cdff6cbfc18f30aeb (diff) | |
| download | brdo-f8d634e38a776769a0ee9b2f6fe6d87cf778ef6a.tar.gz brdo-f8d634e38a776769a0ee9b2f6fe6d87cf778ef6a.tar.bz2 | |
- Patch #18093 by Junyor: clean up handling of image toolkit code in absence of
any toolkits.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system.module | 8 | ||||
| -rw-r--r-- | modules/system/system.module | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/modules/system.module b/modules/system.module index f9ed77254..e3c5b5ecd 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 f9ed77254..e3c5b5ecd 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(); |