Merge pull request #109 from apility/develop

Merge develop into master
apility · Nov 26, 2019 · 3466be0 · 3466be0
2 parents 40cde58 + 19443bf
commit 3466be0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/src/functions/common/functions_pages.php b/src/functions/common/functions_pages.php
@@ -93,25 +93,21 @@ function get_full_content_array($page_id)
     $contentItems = json_decode(NF::$capi->get('builder/pages/' . $page_id . '/content')->getBody(), true);
 
     foreach ($contentItems as $item) {
-      if (isset($content[$item['area']])) {
-        $existing = $content[$item['area']];
-        $content[$item['area']] = null;
-        $content[$item['area']] = [];
-        $content[$item['area']][] = $existing;
-
-        if (!isset($content[$item['area']][0])) {
-          $existing = $content[$item['area']];
-          $content[$item['area']] = null;
-          $content[$item['area']] = [];
-          $content[$item['area']][] = $existing;
+      if ($item['published']) {
+        if (isset($content[$item['area']])) {
+          if (!isset($content[$item['area']][0])) {
+            $existing = $content[$item['area']];
+            $content[$item['area']] = null;
+            $content[$item['area']] = [];
+            $content[$item['area']][] = $existing;
+          }
+          $content[$item['area']][] = $item;
+        } else {
+          $content[$item['area']] = $item;
         }
 
-        $content[$item['area']][] = $item;
-      } else {
-        $content[$item['area']] = $item;
+        $content['id_' . $item['id']] = $item;
       }
-
-      $content['id_' . $item['id']] = $item;
     }
 
     NF::$cache->save('page/' . $page_id, $content);

diff --git a/...ion_blocks/__snapshots__/Common_DisplayPageBlocksTest__testOutputsMatchesSnapshot__1.html b/...ion_blocks/__snapshots__/Common_DisplayPageBlocksTest__testOutputsMatchesSnapshot__1.html
@@ -1,4 +1,3 @@
 <!DOCTYPE html>
 <html>
-<body><h1>Test component [display_page_blocks]</h1>
-<h1>Test component [display_page_blocks]</h1></body></html>
+<body><h1>Test component [display_page_blocks]</h1></body></html>
diff --git a/tests/TestSuites/Common/function_blocks/common.display_page_blocks.test.php b/tests/TestSuites/Common/function_blocks/common.display_page_blocks.test.php
@@ -30,7 +30,8 @@ public function testOutputsMatchesSnapshot(): void
             'sorting' => null,
             'name' => 'Test 1',
             'title' => 'nfabcdefghijklmno1',
-            'text' => 1
+            'text' => 1,
+            'published' => 1
           ],
           [
             'id' => 2,
@@ -39,7 +40,8 @@ public function testOutputsMatchesSnapshot(): void
             'sorting' => null,
             'name' => 'Test 2',
             'title' => 'nfabcdefghijklmno2',
-            'text' => 1
+            'text' => 1,
+            'published' => 0
           ]
         ]
       ))