From 38734f17b900f46fe42bba10c245254784e6debc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 8 Dec 2018 15:22:54 -0500 Subject: [PATCH] Honor item delivery data legacy fields --- src/Model/Item.php | 4 ++-- src/Model/ItemDeliveryData.php | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 870c9b1256..f212045206 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -551,7 +551,7 @@ class Item extends BaseObject $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST); - $fields['item-delivery-data'] = ItemDeliveryData::FIELD_LIST; + $fields['item-delivery-data'] = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, ItemDeliveryData::FIELD_LIST); $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']; @@ -730,7 +730,7 @@ class Item extends BaseObject foreach ($fields as $table => $table_fields) { foreach ($table_fields as $field => $select) { if (empty($selected) || in_array($select, $selected)) { - $legacy_fields = array_merge(ItemDeliveryData::FIELD_LIST, self::MIXED_CONTENT_FIELDLIST); + $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST); if (self::isLegacyMode() && in_array($select, $legacy_fields)) { $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`"; } diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php index e3be073e8e..fa69af8419 100644 --- a/src/Model/ItemDeliveryData.php +++ b/src/Model/ItemDeliveryData.php @@ -10,10 +10,13 @@ use Friendica\Database\DBA; class ItemDeliveryData { - const FIELD_LIST = [ + const LEGACY_FIELD_LIST = [ // Legacy fields moved from item table 'postopts', 'inform', + ]; + + const FIELD_LIST = [ // New delivery fields with virtual field name in item fields 'queue_count' => 'delivery_queue_count', 'queue_done' => 'delivery_queue_done',