Docs: add a note on adding `use` on theme.php

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 6d3ffb2224c047cb001fd2b0bfd49478fe093b76..b7292384268a4bc21f94e62b4c242701e54bd4f9 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function redir_init(App $a) {
 
@@ -21,9 +22,12 @@ function redir_init(App $a) {
                                intval(local_user())
                        );
 
-                       if (!dbm::is_result($r) || ($r[0]['network'] !== NETWORK_DFRN))
+                       if (!DBM::is_result($r)) {
                                goaway(System::baseUrl());
-
+                       }
+                       if ($r[0]['network'] !== NETWORK_DFRN) {
+                               goaway(($url != '' ? $url : $r[0]['url']));
+                       }
                        $cid = $r[0]['id'];
                } else {
                        $cid = $a->argv[1];
@@ -33,11 +37,11 @@ function redir_init(App $a) {
                                intval(local_user())
                        );
 
-                       if (!dbm::is_result($r)) {
+                       if (!DBM::is_result($r)) {
                                goaway(System::baseUrl());
                        }
                        if ($r[0]['network'] !== NETWORK_DFRN) {
-                               goaway($r[0]['url']);
+                               goaway(($url != '' ? $url : $r[0]['url']));
                        }
                }