X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffilerm.php;h=bd46a8bfea2cc540eac71b44b24a9d0637654195;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=7662289ad255e1f0d0e50d8276b296eeca8e33e2;hpb=8ce20f975c7fc1c27d1981234aefc93b0e7b662a;p=friendica.git

diff --git a/mod/filerm.php b/mod/filerm.php
index 7662289ad2..bd46a8bfea 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,6 +1,9 @@
 <?php
 
-function filerm_content(App &$a) {
+use Friendica\App;
+use Friendica\Core\System;
+
+function filerm_content(App $a) {
 
 	if (! local_user()) {
 		killme();
@@ -22,14 +25,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']);
+		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 	}
-=======
-	if(x($_SESSION,'return_url'))
-		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
->>>>>>> HEAD~33
 
 	killme();
 }