Merge remote-tracking branch 'upstream/develop' into issue-3326

[friendica.git] / mod / subthread.php

diff --git a/mod/subthread.php b/mod/subthread.php
index 368619dec47c8a59fc6b8c66bafd8d8640ef3294..646a4230c5f486819100624ddf754231b52814d1 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function subthread_content(App &$a) {
+function subthread_content(App $a) {
 
        if(! local_user() && ! remote_user()) {
                return;
@@ -49,7 +49,7 @@ function subthread_content(App &$a) {
                }
        }
 
-       // this represents the post owner on this system. 
+       // this represents the post owner on this system.
 
        $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
@@ -86,11 +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 );
->>>>>>> HEAD~33
        $link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
        $body = $item['body'];