diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
| commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
| tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /include/Scrape.php | |
| parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
| parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
| download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip | |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'include/Scrape.php')
| -rw-r--r--[-rwxr-xr-x] | include/Scrape.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/Scrape.php b/include/Scrape.php index 9c237916b..b20d7d604 100755..100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -446,7 +446,7 @@ function probe_url($url, $mode = PROBE_NORMAL) { $phost = substr($url,strpos($url,'@')+1); $profile = 'http://' . $phost; // fix nick character range - $vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url)); + $vcard = array('fn' => $name, 'nick' => $name, 'photo' => avatar_img($url)); $notify = 'smtp ' . random_string(); $poll = 'email ' . random_string(); $priority = 0; @@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) { logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA); $a = get_app(); - logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA); + logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA); $feed->set_raw_data($xml); @@ -655,7 +655,7 @@ function probe_url($url, $mode = PROBE_NORMAL) { } if((! $vcard['photo']) && strlen($email)) - $vcard['photo'] = gravatar_img($email); + $vcard['photo'] = avatar_img($email); if($poll === $profile) $lnk = $feed->get_permalink(); if(isset($lnk) && strlen($lnk)) |