strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

According to @annando and @MrPetovan, $emailcc is no item field (column) and (#5401)

Browse source 
should be initialized empty (I did it above the `if()` block).

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-07-18 23:26:14 +02:00 committed by Hypolite Petovan
parent 6e1ed0b0d3
commit 346790cbbc
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/item.php
View file

@ -182,6 +182,7 @@ function item_post(App $a) {
$categories = ''; $categories = '';
$postopts = ''; $postopts = '';
$emailcc = '';
if (!empty($orig_post)) { if (!empty($orig_post)) {
$str_group_allow = $orig_post['allow_gid']; $str_group_allow = $orig_post['allow_gid'];
@ -192,7 +193,6 @@ function item_post(App $a) {
$coord = $orig_post['coord']; $coord = $orig_post['coord'];
$verb = $orig_post['verb']; $verb = $orig_post['verb'];
$objecttype = $orig_post['object-type']; $objecttype = $orig_post['object-type'];
$emailcc = $orig_post['emailcc'];
$app = $orig_post['app']; $app = $orig_post['app'];
$categories = $orig_post['file']; $categories = $orig_post['file'];
$title = notags(trim($_REQUEST['title'])); $title = notags(trim($_REQUEST['title']));
@ -210,7 +210,6 @@ function item_post(App $a) {
* use the user default permissions - as they won't have * use the user default permissions - as they won't have
* been supplied via a form. * been supplied via a form.
*/ */
/// @TODO use x($_REQUEST, 'foo') here
if ($api_source if ($api_source
&& !array_key_exists('contact_allow', $_REQUEST) && !array_key_exists('contact_allow', $_REQUEST)
&& !array_key_exists('group_allow', $_REQUEST) && !array_key_exists('group_allow', $_REQUEST)

2
src/Model/Item.php
View file

@ -72,7 +72,7 @@ class Item extends BaseObject
'title', 'content-warning', 'body', 'location', 'coord', 'app', 'title', 'content-warning', 'body', 'location', 'coord', 'app',
'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target', 'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target',
'author-id', 'author-link', 'author-name', 'author-avatar', '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. // 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. // The item-activity table only stores the index and needs this array to know the matching activity.