From fbd72a9be92b0b50a637c91a941ad9325439181f Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Sat, 12 Mar 2016 15:31:35 +0100
Subject: [PATCH] prevent markup output when regular/featured faq is empty

---
 controller/classes/Subtemplate.php | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/controller/classes/Subtemplate.php b/controller/classes/Subtemplate.php
index 2f927f3..2ee0cf7 100644
--- a/controller/classes/Subtemplate.php
+++ b/controller/classes/Subtemplate.php
@@ -647,9 +647,17 @@ class Subtemplate {
 
         return $result;
     }
+
+
+    //
+    // Subtemplate: FAQs
+    //
     public function faq($subtemplateTitle) {
-        $featuredFAQ = '<dl class="featured-faqs">';
+
         if (have_rows('featured_faqs')) {
+
+            $featuredFAQ = '<dl class="featured-faqs">';
+
             while (have_rows('featured_faqs')) {
                 the_row();
 
@@ -659,11 +667,14 @@ class Subtemplate {
                 $featuredFAQ .= "<dt>{$question}</dt>
                                 <dd>{$answer}</dd>";
             }
-        }
-        $featuredFAQ .= "</dl>";
 
-        $regularFAQ = '<dl class="regular-faqs">';
+            $featuredFAQ .= "</dl>";
+        }
+
         if (have_rows('regular_faqs')) {
+
+            $regularFAQ = '<dl class="regular-faqs">';
+
             while (have_rows('regular_faqs')) {
                 the_row();
 
@@ -673,8 +684,9 @@ class Subtemplate {
                 $regularFAQ .= "<dt>Q: {$question}</dt>
                                 <dd>A: {$answer}</dd>";
             }
+
+            $regularFAQ .= "</dl>";
         }
-        $regularFAQ .= "</dl>";
 
         $result = "<section class='subtemplate row row--content content faq'>
                         <h1>{$subtemplateTitle}</h1>
@@ -684,6 +696,8 @@ class Subtemplate {
 
         return $result;
     }
+
+
     public function values($subtemplateTitle) {
         $values = '';
         if (have_rows('ascribe_values')) {
@@ -707,6 +721,8 @@ class Subtemplate {
 
         return $result;
     }
+
+
     public function careers($subtemplateTitle) {
         $args           = array(
             'post_type' => 'career',
@@ -735,6 +751,8 @@ class Subtemplate {
 
         return $result;
     }
+
+
     public function mediaDetail($subtemplateTitle) {
         $image = get_sub_field('image')['url'];