diff options
| author | friendica <info@friendica.com> | 2014-09-02 17:43:42 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-02 17:43:42 -0700 |
| commit | c7decf70a2d11dc2e208a508a0e7503139ab18c9 (patch) | |
| tree | 8a83b4f358e7b6b7faada6a59204514dee48aae5 | |
| parent | 2c94d59cba0b3231b0dd822fc1b95bed5521c48d (diff) | |
| download | volse-hubzilla-c7decf70a2d11dc2e208a508a0e7503139ab18c9.tar.gz volse-hubzilla-c7decf70a2d11dc2e208a508a0e7503139ab18c9.tar.bz2 volse-hubzilla-c7decf70a2d11dc2e208a508a0e7503139ab18c9.zip | |
feed removal issue
| -rw-r--r-- | include/Contact.php | 2 | ||||
| -rw-r--r-- | include/network.php | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/Contact.php b/include/Contact.php index a9e737bde..0590f9d1e 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -484,7 +484,7 @@ function contact_remove($channel_id, $abook_id) { ); if($r) { foreach($r as $rr) { - drop_item($rr,false); + drop_item($rr['id'],false); } } diff --git a/include/network.php b/include/network.php index 77c1550ba..5ca60b5fe 100644 --- a/include/network.php +++ b/include/network.php @@ -896,11 +896,13 @@ function discover_by_url($url,$arr = null) { if($item) { $author = $item->get_author(); if($author) { - $name = trim(unxmlify($author->get_name())); - if(! $name) - $name = trim(unxmlify($author->get_email())); - if(strpos($name,'@') !== false) - $name = substr($name,0,strpos($name,'@')); + if(! $name) { + $name = trim(unxmlify($author->get_name())); + if(! $name) + $name = trim(unxmlify($author->get_email())); + if(strpos($name,'@') !== false) + $name = substr($name,0,strpos($name,'@')); + } if(! $profile && $author->get_link()) $profile = trim(unxmlify($author->get_link())); } |