harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feed removal issue

Browse Source
This commit is contained in:
friendica 2014-09-02 17:43:42 -07:00
parent 2c94d59cba
commit c7decf70a2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Contact.php
View File

@ -484,7 +484,7 @@ function contact_remove($channel_id, $abook_id) {
); );
if($r) { if($r) {
foreach($r as $rr) { foreach($r as $rr) {
drop_item($rr,false); drop_item($rr['id'],false);
} }
} }

12
include/network.php
View File

@ -896,11 +896,13 @@ function discover_by_url($url,$arr = null) {
if($item) { if($item) {
$author = $item->get_author(); $author = $item->get_author();
if($author) { if($author) {
$name = trim(unxmlify($author->get_name())); if(! $name) {
if(! $name) $name = trim(unxmlify($author->get_name()));
$name = trim(unxmlify($author->get_email())); if(! $name)
if(strpos($name,'@') !== false) $name = trim(unxmlify($author->get_email()));
$name = substr($name,0,strpos($name,'@')); if(strpos($name,'@') !== false)
$name = substr($name,0,strpos($name,'@'));
}
if(! $profile && $author->get_link()) if(! $profile && $author->get_link())
$profile = trim(unxmlify($author->get_link())); $profile = trim(unxmlify($author->get_link()));
} }