From 561f22cdc4a27b4aae8cf7526047fe65db8a4a27 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 8 Nov 2022 04:20:19 -0500 Subject: [PATCH] Add title to homepage verified check mark - Decrease log level for not found Memcached keys --- src/Core/Cache/Type/MemcachedCache.php | 2 +- src/Model/Profile.php | 1 + view/templates/profile/vcard.tpl | 2 +- view/theme/frio/templates/profile/vcard.tpl | 10 +++++----- view/theme/quattro/templates/profile/vcard.tpl | 2 +- view/theme/vier/templates/profile/vcard.tpl | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Core/Cache/Type/MemcachedCache.php b/src/Core/Cache/Type/MemcachedCache.php index 2d8b4e1c2f..3d4627de33 100644 --- a/src/Core/Cache/Type/MemcachedCache.php +++ b/src/Core/Cache/Type/MemcachedCache.php @@ -127,7 +127,7 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) { return $value; } elseif ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) { - $this->logger->notice('Try to use unknown key.', ['key' => $key]); + $this->logger->debug('Try to use unknown key.', ['key' => $key]); return null; } else { throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode())); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 367680c42c..dcd39a30c1 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -467,6 +467,7 @@ class Profile '$account_type' => $account_type, '$location' => $location, '$homepage' => $homepage, + '$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'), '$about' => $about, '$network' => DI::l10n()->t('Network:'), '$contacts' => $contact_count, diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index a304a9a1fb..7c301db8c7 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -39,7 +39,7 @@ {{if $updated}}{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}} diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index 35e3c84198..3a185d8746 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -77,7 +77,7 @@ {{if $location}}
- + {{if $profile.address}}

{{$profile.address nofilter}}

{{/if}} {{if $profile.location}}

{{$profile.location}}

{{/if}} @@ -87,14 +87,14 @@ {{if $profile.xmpp}} {{/if}} {{if $profile.matrix}} {{/if}} @@ -107,8 +107,8 @@ {{if $homepage}}
- - {{include file="sub/punct_wrap.tpl" text=$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}} + + {{include file="sub/punct_wrap.tpl" text=$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl index 86d4889c8c..6a874bf51a 100644 --- a/view/theme/quattro/templates/profile/vcard.tpl +++ b/view/theme/quattro/templates/profile/vcard.tpl @@ -53,7 +53,7 @@ {{if $homepage}}
{{$homepage}}
-
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
+
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 0a93480153..05199f227a 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -45,7 +45,7 @@ {{if $updated}}{{/if}} - {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} ✔{{/if}}
{{/if}} + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}{{if $profile.homepage_verified}} {{/if}}
{{/if}} {{if $about}}
{{$about}}
{{$profile.about nofilter}}
{{/if}}