diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-04 09:22:43 +0100 |
| commit | 51bcfb649fe2a20c9b8b1e66bc59e39da80d326b (patch) | |
| tree | ef804b85942d5774a2c680d9696b65f3dc88d417 /include | |
| parent | f3005918aff04fc435d0f526bf235bd95468294c (diff) | |
| parent | f057cc3a70dd7435b4e9e8a2a07406f0f25e3f2a (diff) | |
| download | volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.gz volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.tar.bz2 volse-hubzilla-51bcfb649fe2a20c9b8b1e66bc59e39da80d326b.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 7 | ||||
| -rw-r--r-- | include/poller.php | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/items.php b/include/items.php index 6f73984e2..0c055f571 100644 --- a/include/items.php +++ b/include/items.php @@ -921,7 +921,10 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) { // Now process the feed if($feed->get_item_quantity()) { - foreach($feed->get_items() as $item) { + // in inverse date order + if ($datedir) + $items = array_reverse($feed->get_items()); + foreach($items as $item) { $deleted = false; @@ -1307,4 +1310,4 @@ function atom_entry($item,$type,$author,$owner,$comment = false) { return $o; } -
\ No newline at end of file + diff --git a/include/poller.php b/include/poller.php index dda0cb0ce..3d13a5480 100644 --- a/include/poller.php +++ b/include/poller.php @@ -225,11 +225,11 @@ if(! strlen($xml)) continue; - consume_feed($xml,$importer,$contact,$hub); + consume_feed($xml,$importer,$contact,$hub,1); // do it twice. Ensures that children of parents which may be later in the stream aren't tossed - consume_feed($xml,$importer,$contact,$hub); + consume_feed($xml,$importer,$contact,$hub,1); if((strlen($hub)) && ($hub_update) |