Merge pull request #3865 from annando/noscrape-last-active

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index 0afd7af1070a9e33ce9d217a7be50b7f289aea38..30c38bf543cbe75812c7fea37046cf06972f8e9d 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,6 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/crypto.php");
 require_once("include/diaspora.php");
@@ -11,7 +12,7 @@ require_once("include/xml.php");
 
 function fetch_init(App $a) {
 
-       if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
+       if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
@@ -30,7 +31,7 @@ function fetch_init(App $a) {
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                       if (normalise_link($host) != normalise_link(System::baseUrl())) {
                                $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
 
                                header("HTTP/1.1 301 Moved Permanently");