undo one of the hooks from last checkin - passing objects led to error
This commit is contained in:
parent
10731ea361
commit
3ba322889f
|
@ -185,6 +185,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
|
||||||
call_hooks('atom_feed_end', $atom);
|
call_hooks('atom_feed_end', $atom);
|
||||||
|
|
||||||
$atom .= '</feed>' . "\r\n";
|
$atom .= '</feed>' . "\r\n";
|
||||||
|
|
||||||
return $atom;
|
return $atom;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -498,7 +499,7 @@ function get_atom_elements($feed,$item) {
|
||||||
$res['target'] .= '</target>' . "\n";
|
$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;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
require_once('include/auth.php');
|
require_once('include/auth.php');
|
||||||
|
|
||||||
|
|
||||||
function dfrn_poll_init(&$a) {
|
function dfrn_poll_init(&$a) {
|
||||||
|
|
||||||
|
|
||||||
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
$dfrn_id = ((x($_GET,'dfrn_id')) ? $_GET['dfrn_id'] : '');
|
||||||
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data');
|
$type = ((x($_GET,'type')) ? $_GET['type'] : 'data');
|
||||||
$last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : '');
|
$last_update = ((x($_GET,'last_update')) ? $_GET['last_update'] : '');
|
||||||
|
|
Loading…
Reference in a new issue