Merge remote branch 'upstream/master'

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index f5821961b001022c92f5a9022ac2cf727f4f4f76..aed0a8e6845f88ed6e7bbdb35d4d9ddf4858a67a 100755 (executable)
--- a/include/items.php
+++ b/include/items.php
@@ -306,6 +306,9 @@ function get_atom_elements($feed,$item) {
        $res['body'] = unxmlify($item->get_content());
        $res['plink'] = unxmlify($item->get_link(0));
 
+       //$debugfile = tempnam("/home/ike/log", "item-res-");
+       //file_put_contents($debugfile, serialize($res));
+
        if($res['plink'])
                $base_url = implode('/', array_slice(explode('/',$res['plink']),0,3));
        else
@@ -1647,7 +1650,6 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                $item_id  = $item->get_id();
                                $datarray = get_atom_elements($feed,$item);
 
-
                                if((! x($datarray,'author-name')) && ($contact['network'] != NETWORK_DFRN))
                                        $datarray['author-name'] = $contact['name'];
                                if((! x($datarray,'author-link')) && ($contact['network'] != NETWORK_DFRN))
@@ -3525,7 +3527,6 @@ function posted_date_widget($url,$uid,$wall) {
        return $o;
 }
 
-
 function store_diaspora_retract_sig($item, $user, $baseurl) {
        // Note that we can't add a target_author_signature
        // if the comment was deleted by a remote user. That should be ok, because if a remote user is deleting