From 2a131472886eed66f603ba73f74648ab262a3baa Mon Sep 17 00:00:00 2001
From: Thomas Pike <thomasp@opera.com>
Date: Wed, 5 Jul 2017 17:40:23 +0200
Subject: [PATCH] Don't export empty comments in bind9 format

Also simplifies the code here to use the already existing
ResourceRecordSet->merge_comment_text() function.
---
 model/zone.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/model/zone.php b/model/zone.php
index 8113065..69b09f2 100644
--- 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";
 			}