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 5684475e29359c9a5e48abdf843f8cc72e357198..76a2964ddc6492eadf4871309f959450d1f3cb1f 100755 (executable)
--- 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/^\./);