From 703c668a37781f0d976c7e8c4de893b48c6da78d Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 2 Sep 2018 08:01:13 +0000 Subject: [PATCH] More notices ... --- include/api.php | 7 +++++-- mod/notifications.php | 3 +-- mod/ping.php | 2 +- src/Model/Profile.php | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/api.php b/include/api.php index f40674b894..3bae11e57d 100644 --- a/include/api.php +++ b/include/api.php @@ -581,7 +581,10 @@ function api_get_user(App $a, $contact_id = null) if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) { $argid = count($called_api); if (!empty($a->argv[$argid])) { - list($user, $null) = explode(".", $a->argv[$argid]); + $data = explode(".", $a->argv[$argid]); + if (count($data) > 1) { + list($user, $null) = $data; + } } if (is_numeric($user)) { $user = DBA::escape(api_unique_id_to_nurl(intval($user))); @@ -4396,7 +4399,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($filetype == "") { $filetype=Image::guessType($filename); } - $imagedata = getimagesize($src); + $imagedata = @getimagesize($src); if ($imagedata) { $filetype = $imagedata['mime']; } diff --git a/mod/notifications.php b/mod/notifications.php index 145c384350..bc581b6dd3 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -115,7 +115,6 @@ function notifications_content(App $a) } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) { $notif_header = L10n::t('Home Notifications'); $notifs = $nm->homeNotifs($show, $startrec, $perpage); - } @@ -134,7 +133,7 @@ function notifications_content(App $a) $notif_tpl = get_markup_template('notifications.tpl'); if (!isset($notifs['ident'])) { - logger('Missing data in notifs: ' . System::callstack(20), LOGGER_DEBUG); + logger('Missing data in notifs: ' . json_encode($a->argv), LOGGER_DEBUG); } // Process the data for template creation diff --git a/mod/ping.php b/mod/ping.php index 99ebde70c1..9867f03f9a 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -519,7 +519,7 @@ function ping_get_notifications($uid) * @param int $forums_unseen Number of unseen forum items * @return array XML-transform ready data array */ -function ping_format_xml_data($data, $sysnotify, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) +function ping_format_xml_data($data, $sysnotify_count, $notifs, $sysmsgs, $sysmsgs_info, $groups_unseen, $forums_unseen) { $notifications = []; foreach ($notifs as $key => $notif) { diff --git a/src/Model/Profile.php b/src/Model/Profile.php index f6e116fa79..29bc7e680d 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -492,7 +492,7 @@ class Profile if (isset($p['address'])) { $p['address'] = BBCode::convert($p['address']); - } else { + } elseif (isset($p['location'])) { $p['address'] = BBCode::convert($p['location']); }