Merge pull request #3034 from annando/1612-no-archive

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 2dda0571b254c406fbf1a008cd9253fd305576fb..5dc5ad372416e2788a376f8dafb1bc903615c217 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,5 @@
 <?php
 
-if(! function_exists('redir_init')) {
 function redir_init(&$a) {
 
        $url = ((x($_GET,'url')) ? $_GET['url'] : '');
@@ -19,7 +18,7 @@ function redir_init(&$a) {
                                intval(local_user())
                        );
 
-                       if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+                       if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
                                goaway(z_root());
 
                        $cid = $r[0]['id'];
@@ -32,7 +31,7 @@ function redir_init(&$a) {
                                intval(local_user())
                        );
 
-                       if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+                       if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
                                goaway(z_root());
                }
 
@@ -58,9 +57,9 @@ function redir_init(&$a) {
                        intval(time() + 45)
                );
 
-               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
+               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
                $dest = (($url) ? '&destination_url=' . $url : '');
-               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
+               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
                        . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
        }
 
@@ -76,4 +75,3 @@ function redir_init(&$a) {
 
        goaway(z_root());
 }
-}