Replace System::httpExit() by HTTPException throwing

[friendica.git] / src / Model / ItemDeliveryData.php

diff --git a/src/Model/ItemDeliveryData.php b/src/Model/ItemDeliveryData.php
index 8d273e22b964bf664c14d5ac7bc5841cdfe1f151..b1fd28e3cb19b181ade9c168d900b7bd41cb62f5 100644 (file)
--- a/src/Model/ItemDeliveryData.php
+++ b/src/Model/ItemDeliveryData.php
@@ -7,6 +7,7 @@
 namespace Friendica\Model;
 
 use Friendica\Database\DBA;
+use \BadMethodCallException;
 
 class ItemDeliveryData
 {
@@ -31,7 +32,7 @@ class ItemDeliveryData
        public static function extractFields(array &$fields)
        {
                $delivery_data = [];
-               foreach (ItemDeliveryData::FIELD_LIST as $key => $field) {
+               foreach (array_merge(ItemDeliveryData::FIELD_LIST, ItemDeliveryData::LEGACY_FIELD_LIST) as $key => $field) {
                        if (is_int($key) && isset($fields[$field])) {
                                // Legacy field moved from item table
                                $delivery_data[$field] = $fields[$field];
@@ -71,7 +72,7 @@ class ItemDeliveryData
        public static function insert($item_id, array $fields)
        {
                if (empty($item_id)) {
-                       throw new \BadMethodCallException('Empty item_id');
+                       throw new BadMethodCallException('Empty item_id');
                }
 
                $fields['iid'] = $item_id;
@@ -92,7 +93,7 @@ class ItemDeliveryData
        public static function update($item_id, array $fields)
        {
                if (empty($item_id)) {
-                       throw new \BadMethodCallException('Empty item_id');
+                       throw new BadMethodCallException('Empty item_id');
                }
 
                if (empty($fields)) {
@@ -113,7 +114,7 @@ class ItemDeliveryData
        public static function delete($item_id)
        {
                if (empty($item_id)) {
-                       throw new \BadMethodCallException('Empty item_id');
+                       throw new BadMethodCallException('Empty item_id');
                }
 
                return DBA::delete('item-delivery-data', ['iid' => $item_id]);