clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed $a->get_baseurl() to App::get_baseurl()

Browse Source 
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder
2016-12-20 12:45:16 +01:00
committed by Roland Haeder
parent 8b8a45b703
commit 8ce20f975c
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mod/subthread.php
View File

@@ -86,7 +86,11 @@ 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'];