Fixing #5555 - Aggregate Special Comment Use

* Aggregate graph does not show other percentiles

CHANGELOG

@@ -116,6 +116,7 @@ Cacti CHANGELOG
 -issue#5534: When deleting a single Data Source the table data_debug is not purged
 -issue#5542: When a form element does not include a 'value' column, provide a more helpful warning message
 -issue#5554: Interface description with equal sign (=) in ifAlias does not show Alias
+-issue#5555: Aggregate graph does not show other percentiles
 -issue#5561: Settings table custom size reverted by database repair
 -issue#5572: RRD Checker timeouts to low
 -issue#5573: Incorrect URL for editing graph template

lib/api_aggregate.php

@@ -1343,6 +1343,8 @@ function aggregate_create_update(&$local_graph_id, $member_graphs, $attribs) {
 }
 
 function aggregate_handle_ptile_type($member_graphs, $skipped_items, $local_graph_id, $_total, $_total_type) {
+	static $special_comments = null;
+
 	$comments_hrules = db_fetch_assoc('SELECT *
 		FROM graph_templates_item
 		WHERE graph_type_id IN(' . GRAPH_ITEM_TYPE_COMMENT . ',' . GRAPH_ITEM_TYPE_HRULE . ')' .
@@ -1356,15 +1358,14 @@ function aggregate_handle_ptile_type($member_graphs, $skipped_items, $local_grap
 		array($local_graph_id));
 
 	if (cacti_sizeof($comments_hrules)) {
-		$hrule_found   = false;
-		$comment_found = false;
+		$hrule_found = false;
 
 		foreach ($comments_hrules as $item) {
 			switch($item['graph_type_id']) {
 				case GRAPH_ITEM_TYPE_COMMENT:
-					if (!$comment_found) {
+					if (!isset($special_comments[$item['text_format']])) {
 						if (preg_match('/(:bits:|:bytes:)/', $item['text_format'])) {
-							$comment_found = true;
+							$special_comments[$item['text_format']] = true;
 
 							$parts = explode('|', $item['text_format']);