Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index 6726d0b1518d815b5ebc05bca6c5bc88ba6d3f46..9bf89a49eda8952e51d86dcf0450ffefb5f13e12 100644 (file)
--- 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);