keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5712 from annando/more-notices

Browse source 
More notices ...
This commit is contained in:
Tobias Diekershoff 2018-09-02 14:46:15 +02:00 committed by GitHub
commit 3ea9b0680a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/api.php
View file

@ -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)) { if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) {
$argid = count($called_api); $argid = count($called_api);
if (!empty($a->argv[$argid])) { 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)) { if (is_numeric($user)) {
$user = DBA::escape(api_unique_id_to_nurl(intval($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 == "") { if ($filetype == "") {
$filetype=Image::guessType($filename); $filetype=Image::guessType($filename);
} }
$imagedata = getimagesize($src); $imagedata = @getimagesize($src);
if ($imagedata) { if ($imagedata) {
$filetype = $imagedata['mime']; $filetype = $imagedata['mime'];
} }

3
mod/notifications.php
View file

@ -115,7 +115,6 @@ function notifications_content(App $a)
} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) { } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
$notif_header = L10n::t('Home Notifications'); $notif_header = L10n::t('Home Notifications');
$notifs = $nm->homeNotifs($show, $startrec, $perpage); $notifs = $nm->homeNotifs($show, $startrec, $perpage);
} }
@ -134,7 +133,7 @@ function notifications_content(App $a)
$notif_tpl = get_markup_template('notifications.tpl'); $notif_tpl = get_markup_template('notifications.tpl');
if (!isset($notifs['ident'])) { 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 // Process the data for template creation

2
mod/ping.php
View file

@ -519,7 +519,7 @@ function ping_get_notifications($uid)
* @param int $forums_unseen Number of unseen forum items * @param int $forums_unseen Number of unseen forum items
* @return array XML-transform ready data array * @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 = []; $notifications = [];
foreach ($notifs as $key => $notif) { foreach ($notifs as $key => $notif) {

2
src/Model/Profile.php
View file

@ -492,7 +492,7 @@ class Profile
if (isset($p['address'])) { if (isset($p['address'])) {
$p['address'] = BBCode::convert($p['address']); $p['address'] = BBCode::convert($p['address']);
} else { } elseif (isset($p['location'])) {
$p['address'] = BBCode::convert($p['location']); $p['address'] = BBCode::convert($p['location']);
} }