diff options
| author | Friendika <info@friendika.com> | 2011-08-01 16:15:37 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-01 16:15:37 -0700 |
| commit | e76990ae7bffdcc5f1c54146f54fc11729c537b7 (patch) | |
| tree | 73c47b6b23052a6010b9a5fd55535e973cda32f7 /include/Scrape.php | |
| parent | 326a873082cd9f31f70bfb703ad2c3e7fde19bb8 (diff) | |
| download | volse-hubzilla-e76990ae7bffdcc5f1c54146f54fc11729c537b7.tar.gz volse-hubzilla-e76990ae7bffdcc5f1c54146f54fc11729c537b7.tar.bz2 volse-hubzilla-e76990ae7bffdcc5f1c54146f54fc11729c537b7.zip | |
bug #111 - don't parse an @ address as a feed
Diffstat (limited to 'include/Scrape.php')
| -rw-r--r-- | include/Scrape.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/Scrape.php b/include/Scrape.php index 6726d0b15..9bf89a49e 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -294,6 +294,8 @@ function probe_url($url) { $twitter = ((strpos($url,'twitter.com') !== false) ? true : false); + $at_addr = ((strpos($url,'@') !== false) ? true : false); + if(! $twitter) { $links = lrdd($url); @@ -452,7 +454,7 @@ function probe_url($url) { $vcard['fn'] = $vcard['nick']; - if(((! isset($vcard)) && (! $poll)) || ($twitter)) { + if(((! isset($vcard)) && (! $poll) && (! $at_addr)) || ($twitter)) { $feedret = scrape_feed($url); logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA); |