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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/mod/filerm.php b/mod/filerm.php
index 7662289ad255e1f0d0e50d8276b296eeca8e33e2..7dbfe29473dd38b02e7c51c9769a9720ed6e106c 100644 (file)
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -22,14 +22,9 @@ function filerm_content(App &$a) {
                file_tag_unsave_file(local_user(),$item_id,$term, $category);
        }
 
-<<<<<<< upstream/develop
        if (x($_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();
 }

diff --git a/mod/subthread.php b/mod/subthread.php
index 368619dec47c8a59fc6b8c66bafd8d8640ef3294..69b7f3a6016d230e963d792b5600534cdb62b4ad 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -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_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'];