summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-11-10 19:59:30 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-11-10 19:59:30 +0000
commit77a72824207be8aced0fe11010f6a1abae471078 (patch)
tree9bc6006ea63a0234e75ae56da8690e50c0065d18
parent4476a2c0156451fb13e3dd2d9308e6c694caa378 (diff)
downloadbrdo-77a72824207be8aced0fe11010f6a1abae471078.tar.gz
brdo-77a72824207be8aced0fe11010f6a1abae471078.tar.bz2
#92059 by Rok Zlender. Disab;e color picker when private file dopwnloads are being used (temporary solution).
-rw-r--r--modules/color/color.module5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/color/color.module b/modules/color/color.module
index b9cdba164..58b2c925d 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -6,7 +6,8 @@
*/
function color_form_alter($form_id, &$form) {
// Insert the color changer into the theme settings page.
- if ($form_id == 'system_theme_settings' && color_get_info(arg(4)) && function_exists('gd_info')) {
+ // 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'),
@@ -539,4 +540,4 @@ function _color_rgb2hsl($rgb) {
$h /= 6;
}
return array($h, $s, $l);
-} \ No newline at end of file
+}