Index: modules/color/color.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/color/color.module,v
retrieving revision 1.13
diff -u -p -r1.13 color.module
--- modules/color/color.module	18 Dec 2006 11:59:07 -0000	1.13
+++ modules/color/color.module	15 Jan 2007 11:29:12 -0000
@@ -6,17 +6,23 @@
  */
 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 #92059.
+       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