From 0ae38c8f988fe7e332ce7254ef51a3dc0202e3a9 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sat, 4 Jan 2014 16:31:02 +0000 Subject: [PATCH] FHEMWEB: preserve & when editing files, by Markus Bloch git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4561 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/01_FHEMWEB.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index fd29b773b..43e4f0d03 100755 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -585,6 +585,10 @@ FW_answerCall($) } FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/svg.js") if($FW_plotmode eq "SVG"); + if($FW_plotmode eq"jsSVG") { + FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/jsSVG.js"); + FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/jquery.min.js"); + } foreach my $js (@FW_fhemwebjs) { FW_pO sprintf($jsTemplate, "$FW_ME/pgm2/$js"); } @@ -1515,6 +1519,8 @@ FW_style($$) my $data = join("", ); close(FH); + $data =~ s/&/&/g; + my $ncols = $FW_ss ? 40 : 80; FW_pO "
"; FW_pO "
";