Add title to homepage verified check mark
- Decrease log level for not found Memcached keys
This commit is contained in:
parent
939a80ceb0
commit
561f22cdc4
|
@ -127,7 +127,7 @@ class MemcachedCache extends AbstractCache implements ICanCacheInMemory
|
||||||
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
|
if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
|
||||||
return $value;
|
return $value;
|
||||||
} elseif ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) {
|
} 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;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode()));
|
throw new CachePersistenceException(sprintf('Cannot get cache entry with key %s', $key), new \MemcachedException($this->memcached->getResultMessage(), $this->memcached->getResultCode()));
|
||||||
|
|
|
@ -467,6 +467,7 @@ class Profile
|
||||||
'$account_type' => $account_type,
|
'$account_type' => $account_type,
|
||||||
'$location' => $location,
|
'$location' => $location,
|
||||||
'$homepage' => $homepage,
|
'$homepage' => $homepage,
|
||||||
|
'$homepage_verified' => DI::l10n()->t('This website has been verified to belong to the same person.'),
|
||||||
'$about' => $about,
|
'$about' => $about,
|
||||||
'$network' => DI::l10n()->t('Network:'),
|
'$network' => DI::l10n()->t('Network:'),
|
||||||
'$contacts' => $contact_count,
|
'$contacts' => $contact_count,
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
|
|
||||||
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
||||||
|
|
||||||
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
|
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
|
|
||||||
{{if $location}}
|
{{if $location}}
|
||||||
<div class="location detail">
|
<div class="location detail">
|
||||||
<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
|
<span class="location-label icon"><i class="fa fa-map-marker" title="{{$location}}"></i></span>
|
||||||
<span class="adr">
|
<span class="adr">
|
||||||
{{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
|
{{if $profile.address}}<p class="street-address p-street-address">{{$profile.address nofilter}}</p>{{/if}}
|
||||||
{{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
|
{{if $profile.location}}<p class="p-location">{{$profile.location}}</p>{{/if}}
|
||||||
|
@ -87,14 +87,14 @@
|
||||||
|
|
||||||
{{if $profile.xmpp}}
|
{{if $profile.xmpp}}
|
||||||
<div class="xmpp">
|
<div class="xmpp">
|
||||||
<span class="xmpp-label icon"><i class="fa fa-xmpp"></i></span>
|
<span class="xmpp-label icon"><i class="fa fa-xmpp" title="{{$xmpp}}"></i></span>
|
||||||
<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
|
<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{if $profile.matrix}}
|
{{if $profile.matrix}}
|
||||||
<div class="matrix">
|
<div class="matrix">
|
||||||
<span class="matrix-label icon"><i class="fa fa-matrix-org"></i></span>
|
<span class="matrix-label icon"><i class="fa fa-matrix-org" title="{{$matrix}}"></i></span>
|
||||||
<span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
|
<span class="matrix-data"><a href="matrix:{{$profile.matrix}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.matrix}}</a></span>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
@ -107,8 +107,8 @@
|
||||||
|
|
||||||
{{if $homepage}}
|
{{if $homepage}}
|
||||||
<div class="homepage detail">
|
<div class="homepage detail">
|
||||||
<span class="homepage-label icon"><i class="fa fa-external-link"></i></span>
|
<span class="homepage-label icon"><i class="fa fa-external-link" title="{{$homepage}}"></i></span>
|
||||||
<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</span>
|
<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank" rel="noopener noreferrer">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</span>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
|
|
||||||
{{if $homepage}}
|
{{if $homepage}}
|
||||||
<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
|
<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
|
||||||
<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd>
|
<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
|
||||||
|
|
||||||
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} ✔{{/if}}</dd></dl>{{/if}}
|
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank" rel="noopener noreferrer">{{$profile.homepage}}</a>{{if $profile.homepage_verified}} <span title="{{$homepage_verified}}">✔</span>{{/if}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network" dir="auto">{{$profile.about nofilter}}</dd></dl>{{/if}}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user