summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/color/color.module28
1 files changed, 17 insertions, 11 deletions
diff --git a/modules/color/color.module b/modules/color/color.module
index f736e9d..ccbf686 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -18,17 +18,23 @@ function color_help($section) {
*/
function color_form_alter($form_id, &$form) {
// Insert the color changer into the theme settings page.
- // TODO: Last condition in the following if disables color changer when private files are used this should be solved in a different way. See issue #92059.
- if ($form_id == 'system_theme_settings' && color_get_info(arg(4)) && function_exists('gd_info') && variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC) {
- $form['color'] = array(
- '#type' => 'fieldset',
- '#title' => t('Color scheme'),
- '#weight' => -1,
- '#attributes' => array('id' => 'color_scheme_form'),
- '#theme' => 'color_scheme_form',
- );
- $form['color'] += color_scheme_form(arg(4));
- $form['#submit']['color_scheme_form_submit'] = array();
+ if ($form_id == 'system_theme_settings' && color_get_info(arg(4)) && function_exists('gd_info')) {
+ if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) != FILE_DOWNLOADS_PUBLIC) {
+ // Disables the color changer when the private download method is used.
+ // TODO: This should be solved in a different way. See issue #181003.
+ drupal_set_message(t('The color picker only works if the <a href="@url">download method</a> is set to public.', array('@url' => url('admin/settings/file-system'))));
+ }
+ else {
+ $form['color'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Color scheme'),
+ '#weight' => -1,
+ '#attributes' => array('id' => 'color_scheme_form'),
+ '#theme' => 'color_scheme_form',
+ );
+ $form['color'] += color_scheme_form(arg(4));
+ $form['#submit']['color_scheme_form_submit'] = array();
+ }
}
// Use the generated screenshot in the theme list