clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for E_NOTICE in mod/item.php (#5393) 

* Fixes applied:
- `if (is_array($some_array))` is better code style than `if ($some_array)` as
  the `if()` block really needs an array to be found
- same with `if ($some_id)`, maybe `if ($some_id > 0)` is a more proper check
- added missing field 'emailcc' to Item::ITEM_FIELDLIST

Signed-off-by: Roland Häder <roland@mxchange.org>

* Fixes E_NOTICE of missing variable (PHP's lazyness again).

Signed-off-by: Roland Häder <roland@mxchange.org>

* Use !empty() to avoid accessing empty array.

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-07-18 00:18:42 +02:00 committed by Hypolite Petovan
parent fd8897851f
commit a41e49c84a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mod/item.php
View File

@ -158,29 +158,32 @@ function item_post(App $a) {
// Now check that valid personal details have been provided // Now check that valid personal details have been provided
if (!can_write_wall($profile_uid) && !$allow_comment) { if (!can_write_wall($profile_uid) && !$allow_comment) {
notice(L10n::t('Permission denied.') . EOL) ; notice(L10n::t('Permission denied.') . EOL) ;
if (x($_REQUEST, 'return')) { if (x($_REQUEST, 'return')) {
goaway($return_path); goaway($return_path);
} }
killme(); killme();
} }
// Init post instance
// is this an edited post?
$orig_post = null; $orig_post = null;
if ($post_id) { // is this an edited post?
if ($post_id > 0) {
$orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]); $orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
} }
$user = dba::selectFirst('user', [], ['uid' => $profile_uid]); $user = dba::selectFirst('user', [], ['uid' => $profile_uid]);
if (!DBM::is_result($user) && !$parent) { if (!DBM::is_result($user) && !$parent) {
return; return;
} }
$categories = ''; $categories = '';
$postopts = '';
if ($orig_post) { if (!empty($orig_post)) {
$str_group_allow = $orig_post['allow_gid']; $str_group_allow = $orig_post['allow_gid'];
$str_contact_allow = $orig_post['allow_cid']; $str_contact_allow = $orig_post['allow_cid'];
$str_group_deny = $orig_post['deny_gid']; $str_group_deny = $orig_post['deny_gid'];

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']; 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'emailcc'];
// 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.