From ca8e779402c4911aac2a0ad884cb2ee23f30dd62 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Mon, 27 Apr 2020 15:35:57 -0400
Subject: [PATCH] Fix issue processwire/processwire-issues#1159

---
 wire/modules/Fieldtype/FieldtypePage.module | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/wire/modules/Fieldtype/FieldtypePage.module b/wire/modules/Fieldtype/FieldtypePage.module
index d27ddc94..8c510bfe 100644
--- a/wire/modules/Fieldtype/FieldtypePage.module
+++ b/wire/modules/Fieldtype/FieldtypePage.module
@@ -378,15 +378,28 @@ class FieldtypePage extends FieldtypeMulti implements Module, ConfigurableModule
 	 *
 	 */
 	public function ___formatValue(Page $page, Field $field, $value) {
-		if($field->get('allowUnpub')) return $value; 
 
 		// remove unpublished pages for front-end formatted output
 		if($value instanceof Page) {
-			if($value->hasStatus(Page::statusUnpublished)) $value = $this->getBlankValue($page, $field); 
-
-		} else if($value instanceof PageArray) {
+			if($value->hasStatus(Page::statusUnpublished)) {
+				$value = $this->getBlankValue($page, $field);
+			}
+		} else if($value instanceof PageArray && $field->get('allowUnpub')) {
+			// unpublished pages are allowed, so if any are present, create new
+			// formatted value that excludes the unpublished pages 
+			$hasUnpublished = false;
 			foreach($value as $item) {
-				if($item->hasStatus(Page::statusUnpublished)) $value->remove($item); 
+				$hasUnpublished = $item->hasStatus(Page::statusUnpublished);
+				if($hasUnpublished) break;
+			}
+			if($hasUnpublished) {
+				$items = $this->getBlankValue($page, $field); 
+				$items->setTrackChanges(false);
+				foreach($value as $item) {
+					if(!$item->hasStatus(Page::statusUnpublished)) $items->add($item); 	
+				}
+				$items->resetTrackChanges(true);
+				$value = $items;
 			}
 		}