harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2018-12-13 16:13:13 -08:00
parent 6464099364 6bea3d6bfc
commit fc78206049
10 changed files with 493 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@@ -420,7 +420,7 @@ function post_activity_item($arr, $allow_code = false, $deliver = true) {
$arr['comment_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'],'post_comments'));
if ((! $arr['plink']) && (intval($arr['item_thread_top']))) {
$arr['plink'] = substr(z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . urlencode($arr['mid']),0,190);
$arr['plink'] = substr(z_root() . '/channel/' . $channel['channel_address'] . '/' . (filter_var($arr['mid'], FILTER_VALIDATE_URL) === false ? '?f=&mid=' : '') . urlencode($arr['mid']),0,190);
}

1
include/photo/photo_imagick.php
View File

@@ -36,6 +36,7 @@ class photo_imagick extends photo_driver {
}
catch (Exception $e) {
logger('imagick readImageBlob() exception:' . print_r($e,true));
return;
}
/**