diff options
| author | zotlabs <mike@macgirvin.com> | 2018-12-13 16:13:13 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-12-13 16:13:13 -0800 |
| commit | fc782060496ee5ca99ffe522b10e6463f4d08cc7 (patch) | |
| tree | 1241d2178cdd2801be485e9f25d710eccf76e2c7 /include | |
| parent | 6464099364f3d4e800137a57d3b9ff9e8f7601e4 (diff) | |
| parent | 6bea3d6bfc984e6f30867f00be5a92b5cd5be925 (diff) | |
| download | volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.tar.gz volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.tar.bz2 volse-hubzilla-fc782060496ee5ca99ffe522b10e6463f4d08cc7.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/photo/photo_imagick.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index b2c288b75..0cbca23fc 100755 --- a/include/items.php +++ b/include/items.php @@ -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); } diff --git a/include/photo/photo_imagick.php b/include/photo/photo_imagick.php index f04c00245..cb3ad27fb 100644 --- a/include/photo/photo_imagick.php +++ b/include/photo/photo_imagick.php @@ -36,6 +36,7 @@ class photo_imagick extends photo_driver { } catch (Exception $e) { logger('imagick readImageBlob() exception:' . print_r($e,true)); + return; } /** |