undo one of the hooks from last checkin - passing objects led to error

diff --git a/include/items.php b/include/items.php
index a606749ce5461373d515e2b4f047164856540694..c00ec93ae3ecb893c8b903ae0d2acea947201532 100644 (file)
--- 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 a8c27efc17e32c0077a41a889622f48fb9e1bfe4..22d2ee40fb7a4cd4fee037caeb44fd8367ad2eb0 100644 (file)
--- 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']          : '');