From a38a842e86405a52fc994f4de70894b6407eb873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Tue, 24 Jul 2018 13:47:25 +0200 Subject: [PATCH] Fixes for E_NOTICE in editpost.php (#5480) * Added missing columns 'wall' and 'post-type'. * Convention: - curly brace after a a method/function declaration belongs to next line - added space for better readability --- mod/editpost.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mod/editpost.php b/mod/editpost.php index d142d3b2fb..258585ef1c 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -11,8 +11,8 @@ use Friendica\Core\System; use Friendica\Model\Item; use Friendica\Database\DBA; -function editpost_content(App $a) { - +function editpost_content(App $a) +{ $o = ''; if (!local_user()) { @@ -28,8 +28,10 @@ function editpost_content(App $a) { } $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', - 'type', 'body', 'title', 'file']; + 'type', 'body', 'title', 'file', 'wall', 'post-type']; + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + if (!DBA::isResult($item)) { notice(L10n::t('Item not found') . EOL); return; @@ -69,7 +71,7 @@ function editpost_content(App $a) { $jotplugins = ''; $jotnets = ''; - $mail_disabled = ((function_exists('imap_open') && !Config::get('system','imap_disabled')) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; @@ -78,8 +80,10 @@ function editpost_content(App $a) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); + if (DBA::isResult($r)) { $mail_enabled = true; + if (intval($r[0]['pubmail'])) { $pubmail_enabled = true; }