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

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

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 8ce20f975c
commit 3472191b05
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/filerm.php
View File

@ -22,14 +22,9 @@ function filerm_content(App &$a) {
file_tag_unsave_file(local_user(),$item_id,$term, $category); file_tag_unsave_file(local_user(),$item_id,$term, $category);
} }
<<<<<<< upstream/develop
if (x($_SESSION,'return_url')) { if (x($_SESSION,'return_url')) {
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']); goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
} }
=======
if(x($_SESSION,'return_url'))
goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
>>>>>>> HEAD~33
killme(); killme();
} }

3
mod/subthread.php
View File

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