diff options
| -rw-r--r-- | include/items.php | 7 | ||||
| -rw-r--r-- | include/network.php | 4 | ||||
| -rw-r--r-- | view/ru/register_verify_member.tpl | 5 |
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}}
|