Merge remote branch 'upstream/master'

diff --combined boot.php
index e9f9efd70d5ee8c9c06ada5d60b467a54ac53b9a,f348ae6e895be5d2478686df7f259c0de22e3d1b..ada0f563d992a52f025d833dbf5bb5c2b7116377
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '2.3.1263' );
+ define ( 'FRIENDICA_VERSION',      '2.3.1264' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 -define ( 'DB_UPDATE_VERSION',      1126      );
 +define ( 'DB_UPDATE_VERSION',      1127      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --combined include/Scrape.php
index e98978f381e8bb3a68c08248f5398712ed6f8e9a,1835892eb022f7ed5ee77fcc2df8ada57c6fad10..4c4ad3cdb935233d35bc820ff2b607c5c06553da
--- 1/include/Scrape.php
--- 2/include/Scrape.php
+++ b/include/Scrape.php
@@@ -230,11 -230,16 +230,16 @@@ function scrape_feed($url) 
        $ret = array();
        $s = fetch_url($url);
  
-       if(! $s) 
+       $headers = $a->get_curl_headers();
+       $code = $a->get_curl_code();
+ 
+       logger('scrape_feed: returns: ' . $code . ' headers=' . $headers, LOGGER_DEBUG);
+ 
+       if(! $s) {
+               logger('scrape_feed: no data returned for ' . $url); 
                return $ret;
+       }
  
-       $headers = $a->get_curl_headers();
-       logger('scrape_feed: headers=' . $headers, LOGGER_DEBUG);
  
        $lines = explode("\n",$headers);
        if(count($lines)) {
@@@ -258,8 -263,10 +263,10 @@@
                logger('scrape_feed: parse error: ' . $e);
        }
  
-       if(! $dom)
+       if(! $dom) {
+               logger('scrape_feed: failed to parse.');
                return $ret;
+       }
  
  
        $head = $dom->getElementsByTagName('base');
@@@ -445,19 -452,10 +452,19 @@@ function probe_url($url, $mode = PROBE_
                                                        $adr = imap_rfc822_parse_adrlist($x->to,'');
                                                if(isset($adr)) {
                                                        foreach($adr as $feadr) {
 -                                                              if((strcasecmp($feadr->mailbox,$name) == 0) 
 -                                                                      &&(strcasecmp($feadr->host,$phost) == 0) 
 +                                                              if((strcasecmp($feadr->mailbox,$name) == 0)
 +                                                                      &&(strcasecmp($feadr->host,$phost) == 0)
                                                                        && (strlen($feadr->personal))) {
 -                                                                      $vcard['fn'] = notags($feadr->personal);
 +
 +                                                                      $personal = imap_mime_header_decode($feadr->personal);
 +                                                                      $vcard['fn'] = "";
 +                                                                      foreach($personal as $perspart)
 +                                                                              if ($perspart->charset != "default")
 +                                                                                      $vcard['fn'] .= iconv($perspart->charset, 'UTF-8//IGNORE', $perspart->text);
 +                                                                              else
 +                                                                                      $vcard['fn'] .= $perspart->text;
 +
 +                                                                      $vcard['fn'] = notags($vcard['fn']);
                                                                }
                                                        }
                                                }
@@@ -565,7 -563,7 +572,7 @@@
                if($check_feed) {
  
                        $feedret = scrape_feed(($poll) ? $poll : $url);
-                       logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
+                       logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA);
                        if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
                                $poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
                                if(! x($vcard))