aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/items.php2
-rw-r--r--include/poller.php3
-rw-r--r--mod/dfrn_poll.php4
3 files changed, 7 insertions, 2 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 8dd4d31ed..77beabf90 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -447,6 +447,7 @@ function dfrn_poll_content(&$a) {
}
$profile = $r[0]['nickname'];
+
switch($destination_url) {
case 'profile':
$dest = $a->get_baseurl() . '/profile/' . $profile . '?tab=profile';
@@ -488,7 +489,10 @@ function dfrn_poll_content(&$a) {
dbesc($session_id)
);
}
+<<<<<<< HEAD
+=======
+>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
goaway($dest);
}