Don't export empty comments in bind9 format

Also simplifies the code here to use the already existing ResourceRecordSet->merge_comment_text() function.
operasoftware · Jul 5, 2017 · 2a13147 · 2a13147
1 parent ee7f27d
commit 2a13147
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/model/zone.php b/model/zone.php
@@ -374,15 +374,9 @@ public function export_as_bind9_format() {
 				$row .= str_pad(DNSTime::abbreviate($rrset->ttl), 6)." ";
 				$row .= str_pad($rrset->type, 6)." ";
 				$row .= str_pad(DNSContent::bind9_format($rr->content, $rrset->type, $this->name), 30);
-				$comments = $rrset->list_comments();
-				if(count($comments) > 0) {
-					$row .= " ; ";
-					$count = 0;
-					foreach($comments as $comment) {
-						$count++;
-						if($count > 1) $row .= " ";
-						$row .= $comment->content;
-					}
+				$comments = $rrset->merge_comment_text();
+				if($comments !== '') {
+					$row .= " ; $comments";
 				}
 				$output .= trim($row)."\n";
 			}