diff options
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; } /** |