From 346790cbbc2e22cdb3d2659bbbacd24c9ac46f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 18 Jul 2018 23:26:14 +0200 Subject: [PATCH] According to @annando and @MrPetovan, $emailcc is no `item` field (column) and (#5401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit should be initialized empty (I did it above the `if()` block). Signed-off-by: Roland Häder --- mod/item.php | 3 +-- src/Model/Item.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/item.php b/mod/item.php index d075d611a..a7a9543d0 100644 --- a/mod/item.php +++ b/mod/item.php @@ -182,6 +182,7 @@ function item_post(App $a) { $categories = ''; $postopts = ''; + $emailcc = ''; if (!empty($orig_post)) { $str_group_allow = $orig_post['allow_gid']; @@ -192,7 +193,6 @@ function item_post(App $a) { $coord = $orig_post['coord']; $verb = $orig_post['verb']; $objecttype = $orig_post['object-type']; - $emailcc = $orig_post['emailcc']; $app = $orig_post['app']; $categories = $orig_post['file']; $title = notags(trim($_REQUEST['title'])); @@ -210,7 +210,6 @@ function item_post(App $a) { * use the user default permissions - as they won't have * been supplied via a form. */ - /// @TODO use x($_REQUEST, 'foo') here if ($api_source && !array_key_exists('contact_allow', $_REQUEST) && !array_key_exists('group_allow', $_REQUEST) diff --git a/src/Model/Item.php b/src/Model/Item.php index 0e01ff7b9..d6635407d 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -72,7 +72,7 @@ class Item extends BaseObject 'title', 'content-warning', 'body', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target', 'author-id', 'author-link', 'author-name', 'author-avatar', - 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'emailcc']; + 'owner-id', 'owner-link', 'owner-name', 'owner-avatar']; // Never reorder or remove entries from this list. Just add new ones at the end, if needed. // The item-activity table only stores the index and needs this array to know the matching activity.