Commit 475bfc83 authored by André Kerkhoff's avatar André Kerkhoff
Browse files

HolidaylistPlugin: Fix bgcolor for day header on public holidays

parent cdd80b1a
......@@ -5,5 +5,5 @@ DEPENDENCIES
GRAPH
apache2 (5.2.1)
foswiki (2.5.0)
foswiki (2.5.1)
apache2 (< 6.0)
......@@ -1053,6 +1053,12 @@ sub _renderHolidayList() {
my $bgcolor;
$bgcolor = $options{weekendbgcolor} unless $dow < 6;
my $pubholidaybgcolor = ( $$iconTableRef{'!!__@ALL__!!'}[$i] . ' ' . $options{pubholidayicon} );
$pubholidaybgcolor =~ s/.*\bcolor\(([^\)]+)\).*/$1/;
$bgcolor = $pubholidaybgcolor
if ( $options{enablepubholidays}
&& ( defined $$iconTableRef{'!!__@ALL__!!'}[$i]
|| defined $$tableRef{'!!__@ALL__!!'}[$i] ) );
$bgcolor = $options{todaybgcolor}
if ( defined $options{todaybgcolor} ) && ( $today == $date );
......
......@@ -3,7 +3,7 @@ maintainer 'HPC'
maintainer_email 'hpc@gsi.de'
license 'All rights reserved'
description 'Installs/Configures Foswiki'
version '2.5.0'
version '2.5.1'
depends 'apache2', '< 6.0'
supports 'debian'
supports 'ubuntu'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment