From f9c85c52f30b13a809fecee6ccc8ce978c2f3fe9 Mon Sep 17 00:00:00 2001
From: Malendur <malendur@secret.fyi>
Date: Thu, 20 May 2021 08:14:58 +0000
Subject: Remove useless test

---
 include/items.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index 29160c01d..839660509 100644
--- a/include/items.php
+++ b/include/items.php
@@ -971,7 +971,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);
 	}
 
@@ -981,8 +981,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;
-- 
cgit v1.2.3


From 300679c0532f7969989d9909771271b125a48f70 Mon Sep 17 00:00:00 2001
From: Malendur <malendur@secret.fyi>
Date: Thu, 20 May 2021 08:23:45 +0000
Subject: Fix phpDoc

---
 include/network.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/network.php b/include/network.php
index fcc7b4289..77b7c49d6 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1118,9 +1118,9 @@ function discover_by_url($url, $arr = null) {
 /**
  * @brief
  *
- * @param string $webbie
+ * @param string $webbie (TODO: explain)
  * @param string $protocol (optional) default empty
- * @return boolean
+ * @return boolean|string (TODO: explain)
  */
 function discover_by_webbie($webbie, $protocol = '') {
 
-- 
cgit v1.2.3


From bc2afb21e1068986ab1e04b487a7909a309a98f8 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Thu, 20 May 2021 12:29:37 +0000
Subject: Fix updated variables

---
 view/ru/register_verify_member.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/view/ru/register_verify_member.tpl b/view/ru/register_verify_member.tpl
index 8a466ddf6..7784a1786 100644
--- a/view/ru/register_verify_member.tpl
+++ b/view/ru/register_verify_member.tpl
@@ -14,10 +14,11 @@ Cайт: {{$siteurl}}
 {{$hash}}
 
 
-{{if $due}}{{$due}}{{/ if}}
-
+{{if $timeframe}}
+Этот код действителен с {{$timeframe.0}} UTC и до {{$timeframe.1}} UTC.
 
 
+{{/if}}
 Если вы зарегистрировали эту учетную запись, введите код подтверждения при запросе или перейдите по следующей ссылке:
 
 {{$siteurl}}/regate/{{$mail}}
-- 
cgit v1.2.3