]> git.mxchange.org Git - friendica.git/commitdiff
profile not set
authorFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:18:28 +0000 (01:18 -0700)
committerFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:18:28 +0000 (01:18 -0700)
include/items.php
include/poller.php
mod/dfrn_poll.php

index 58fad99272a62dcb496b1cd9e7f3d0cdde01cad8..1dd39d2ba9f4f7012d8b8bb520c16088b6cd05c1 100644 (file)
@@ -901,7 +901,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
  *
  */
 
-function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
+function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_feed = false) {
 
        require_once('simplepie/simplepie.inc');
 
index 8619697d9661d3697f1f20e5ed00d0b7e013208b..3b80c1c04b2aa79dba370a03c7b3f13af68c5971 100644 (file)
@@ -278,7 +278,8 @@ function poller_run($argv, $argc){
                                continue;
                        }
 
-                       consume_feed($xml,$importer,$contact,$hub,1);
+
+                       consume_feed($xml,$importer,$contact,$hub,1, true);
 
                        // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
 
index 25b28c63cef1e7a67aa24eacf43f16e5c9c6dc52..4b25efe418c0b130824aa653f4d13b60e77e0bce 100644 (file)
@@ -446,6 +446,8 @@ function dfrn_poll_content(&$a) {
                                ));
                        }
 
+                       $profile = $r[0]['nickname'];
+
                        switch($destination_url) {
                                case 'profile':
                                        $dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
@@ -487,7 +489,6 @@ function dfrn_poll_content(&$a) {
                                                dbesc($session_id)
                                        ); 
                                }
-                               $profile = $r[0]['nickname'];
                        
                                goaway($dest);
                        }