aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-05-21 06:38:40 +0000
committerMario <mario@mariovavti.com>2021-05-21 06:38:40 +0000
commitc9981ff0e176934a99a198068da332bb1a65fbde (patch)
treecb3ddb97ee093cfbb4812fc0cc14d43146b14c5d /include
parent0948b061fea48871bb98f32c84cc7701e124078c (diff)
parentf9c85c52f30b13a809fecee6ccc8ce978c2f3fe9 (diff)
downloadvolse-hubzilla-c9981ff0e176934a99a198068da332bb1a65fbde.tar.gz
volse-hubzilla-c9981ff0e176934a99a198068da332bb1a65fbde.tar.bz2
volse-hubzilla-c9981ff0e176934a99a198068da332bb1a65fbde.zip
Merge branch 'Malend-dev-patch-02229' into 'dev'
Remove useless test See merge request hubzilla/core!1957
Diffstat (limited to 'include')
-rw-r--r--include/items.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index 30129b0aa..272ce5a69 100644
--- a/include/items.php
+++ b/include/items.php
@@ -972,7 +972,7 @@ function import_author_xchan($x) {
if($y)
return $y;
- if(!$y && !isset($x['network']) || $x['network'] === 'zot') {
+ if(!isset($x['network']) || $x['network'] === 'zot') {
$y = import_author_zot($x);
}
@@ -982,8 +982,9 @@ function import_author_xchan($x) {
$r = q("SELECT xchan_hash FROM xchan WHERE xchan_url = '%s' AND xchan_network = 'zot6'",
dbesc($x['url'])
);
- if(! $r)
- discover_by_webbie($x['url'], 'zot6');
+ // TODO: fix dupplicate with line 960
+ if(!$r)
+ discover_by_webbie($x['url'], 'zot6'); //TODO use the return of discover_by_webbie
}
return $y;