aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-04 01:18:28 -0700
committerFriendika <info@friendika.com>2011-04-04 01:18:28 -0700
commitb5bcf44354410e2c37d5ec143c7050c3903200ed (patch)
tree888df4d6efaf24b523df9be1b59a3b200d2ed07e
parent9b50b0e16f2046b91cb4c734c56024524d8b178b (diff)
downloadvolse-hubzilla-b5bcf44354410e2c37d5ec143c7050c3903200ed.tar.gz
volse-hubzilla-b5bcf44354410e2c37d5ec143c7050c3903200ed.tar.bz2
volse-hubzilla-b5bcf44354410e2c37d5ec143c7050c3903200ed.zip
profile not set
-rw-r--r--include/items.php2
-rw-r--r--include/poller.php3
-rw-r--r--mod/dfrn_poll.php3
3 files changed, 5 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 58fad9927..1dd39d2ba 100644
--- a/include/items.php
+++ b/include/items.php
@@ -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');
diff --git a/include/poller.php b/include/poller.php
index 8619697d9..3b80c1c04 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -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
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 25b28c63c..4b25efe41 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -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);
}