Browse Source

added more curly braces + space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
pull/3043/head
Roland Häder 4 years ago
committed by Roland Haeder
parent
commit
54905a3d81
No known key found for this signature in database GPG Key ID: B72F8185C6C7BD78
1 changed files with 0 additions and 7 deletions
  1. +0
    -7
      mod/subthread.php

+ 0
- 7
mod/subthread.php View File

@ -86,14 +86,7 @@ function subthread_content(App &$a) {
$uri = item_new_uri($a->get_hostname(),$owner_uid);
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
<<<<<<< upstream/develop
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
=======
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
<<<<<<< upstream/develop
>>>>>>> HEAD~33
=======
>>>>>>> HEAD~32
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$body = $item['body'];


Loading…
Cancel
Save