Merge pull request #3595 from annando/1707-realpath

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 6e1f9069472040cf56b51ad262bbc2f31467235f..8d5cb991267ea620b7f822a7349df424e15111bf 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,9 +1,11 @@
 <?php
 
-require_once('include/Scrape.php');
-require_once('include/follow.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
+use Friendica\App;
+
+require_once 'include/probe.php';
+require_once 'include/follow.php';
+require_once 'include/Contact.php';
+require_once 'include/contact_selectors.php';
 
 function follow_content(App $a) {
 
@@ -35,14 +37,14 @@ function follow_content(App $a) {
 
        $ret = probe_url($url);
 
-       if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) {
+       if (($ret["network"] == NETWORK_DIASPORA) && !get_config('system','diaspora_enabled')) {
                notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       if (($ret["network"] == NETWORK_OSTATUS) AND get_config('system','ostatus_disabled')) {
+       if (($ret["network"] == NETWORK_OSTATUS) && get_config('system','ostatus_disabled')) {
                notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);