diff options
author | Friendika <info@friendika.com> | 2010-12-24 19:04:40 -0800 |
---|---|---|
committer | Friendika <info@friendika.com> | 2010-12-24 19:04:40 -0800 |
commit | 3ba322889fdfecc07099377cf6e28c4b2fb30e59 (patch) | |
tree | 4be2100f2f9b06c7c761c784fb826b6cd61742ae | |
parent | 10731ea361005bc6a56516ad03984b6c366b3a27 (diff) | |
download | volse-hubzilla-3ba322889fdfecc07099377cf6e28c4b2fb30e59.tar.gz volse-hubzilla-3ba322889fdfecc07099377cf6e28c4b2fb30e59.tar.bz2 volse-hubzilla-3ba322889fdfecc07099377cf6e28c4b2fb30e59.zip |
undo one of the hooks from last checkin - passing objects led to error
-rw-r--r-- | include/items.php | 3 | ||||
-rw-r--r-- | mod/dfrn_poll.php | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index a606749ce..c00ec93ae 100644 --- a/include/items.php +++ b/include/items.php @@ -185,6 +185,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { call_hooks('atom_feed_end', $atom); $atom .= '</feed>' . "\r\n"; + return $atom; } @@ -498,7 +499,7 @@ function get_atom_elements($feed,$item) { $res['target'] .= '</target>' . "\n"; } - call_hooks('parse_atom', array('feed' => $feed, 'item' => $item, 'result' => $res)); +// call_hooks('parse_atom', array('feed' => $feed, 'item' => $item, 'result' => $res)); return $res; } diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index a8c27efc1..22d2ee40f 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -1,11 +1,14 @@ <?php + + require_once('include/items.php'); require_once('include/auth.php'); function dfrn_poll_init(&$a) { + $dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : ''); $type = ((x($_GET,'type')) ? $_GET['type'] : 'data'); $last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : ''); |