aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-05-21 06:44:21 +0000
committerMario <mario@mariovavti.com>2021-05-21 06:44:21 +0000
commit5705005ca3172f7f6fe56a61761de6a8a54a8f10 (patch)
tree2696dbfb52c54f23a653aa0c09312fbca101d8f4
parent79b4642b32b441e8b2d7924577af59c1c15ee092 (diff)
parentc9981ff0e176934a99a198068da332bb1a65fbde (diff)
downloadvolse-hubzilla-5705005ca3172f7f6fe56a61761de6a8a54a8f10.tar.gz
volse-hubzilla-5705005ca3172f7f6fe56a61761de6a8a54a8f10.tar.bz2
volse-hubzilla-5705005ca3172f7f6fe56a61761de6a8a54a8f10.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--include/items.php7
-rw-r--r--include/network.php4
-rw-r--r--view/ru/register_verify_member.tpl5
3 files changed, 9 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php
index 7be3d5286..63edae972 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;
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 = '') {
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}}