]>
Commit | Line | Data |
---|---|---|
4086ef97 GS |
1 | --- cacti-0.8.6j/lib/rrd.php 2007-01-17 19:23:10.000000000 -0500 |
2 | +++ cacti-0.8.6j-patch/lib/rrd.php 2007-02-01 20:29:59.687500000 -0500 | |
3 | @@ -1080,9 +1080,15 @@ | |
4 | ||
5 | if ($graph_item_types{$graph_item["graph_type_id"]} == "COMMENT") { | |
6 | if (read_config_option("rrdtool_version") == "rrd-1.2.x") { | |
7 | - $txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" "; | |
8 | + $comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]) . $hardreturn[$graph_item_id] . "\" "; | |
9 | + if (trim($comment_string) != "COMMENT:\"\"") { | |
10 | + $txt_graph_items .= $comment_string; | |
11 | + } | |
12 | }else { | |
13 | - $txt_graph_items .= $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" "; | |
14 | + $comment_string = $graph_item_types{$graph_item["graph_type_id"]} . ":\"" . $graph_variables["text_format"][$graph_item_id] . $hardreturn[$graph_item_id] . "\" "; | |
15 | + if (trim($command_string) != "COMMENT:\"\"") { | |
16 | + $txt_graph_items .= $comment_string; | |
17 | + } | |
18 | } | |
19 | }elseif (($graph_item_types{$graph_item["graph_type_id"]} == "GPRINT") && (!isset($graph_data_array["graph_nolegend"]))) { | |
20 | $graph_variables["text_format"][$graph_item_id] = str_replace(":", "\:", $graph_variables["text_format"][$graph_item_id]); /* escape colons */ |