From: octo Date: Wed, 10 May 2006 20:06:08 +0000 (+0000) Subject: octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8 X-Git-Tag: collectd-3.8.6~1 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=648b87012c84bc5d4d8621fe537d76e75c742cde;p=collectd.git octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8 octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.9 --- diff --git a/contrib/collection.cgi b/contrib/collection.cgi index 5684475e..76a2964d 100755 --- a/contrib/collection.cgi +++ b/contrib/collection.cgi @@ -766,7 +766,7 @@ our $GraphMulti = ping => \&output_graph_ping, sensors => 1, traffic => 1, - users => 1 + users => 1 }; our @Info; @@ -1281,7 +1281,7 @@ sub parse_pathinfo $AbsDir = $Config->{'Directory'}; $RelDir = ''; - while (@info and -d $AbsDir . '/' . $Info[0]) + while (@info and -d $AbsDir . '/' . $info[0]) { my $new = shift (@info); next if ($new =~ m/^\./);