clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8277 from MrPetovan/task/8251-use-about-for-pdesc 

Remove profile about field double HTML escaping
This commit is contained in:
Michael Vogel 2020-02-12 05:23:04 +01:00 committed by GitHub
parent 6c18e7a064 1ce5b1d65b
commit 13a10b8f20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/cal.php
View File

@ -26,6 +26,7 @@
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
@ -70,14 +71,14 @@ function cal_init(App $a)
$account_type = Contact::getAccountType($profile);
$tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
$tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?: '',
'$account_type' => $account_type,
'$about' => $profile['about'] ?: '',
'$about' => BBCode::convert($profile['about'] ?: ''),
]);
$cal_widget = Widget\CalendarExport::getHTML();

2
mod/common.php
View File

@ -63,7 +63,7 @@ function common_content(App $a)
$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
if (DBA::isResult($contact)) {
$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("widget/vcard.tpl"), [
$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
'$name' => $contact['name'],
'$photo' => $contact['photo'],
'url' => 'contact/' . $cid

4
mod/photos.php
View File

@ -74,14 +74,14 @@ function photos_init(App $a) {
$account_type = Contact::getAccountType($profile);
$tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
$tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type,
'$about' => $profile['about'] ?? '',
'$about' => BBCode::convert($profile['about'] ?? ''),
]);
$albums = Photo::getAlbums($a->data['user']['uid']);

5
mod/videos.php
View File

@ -22,6 +22,7 @@
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
@ -59,14 +60,14 @@ function videos_init(App $a)
$account_type = Contact::getAccountType($profile);
$tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
$tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
$vcard_widget = Renderer::replaceMacros($tpl, [
'$name' => $profile['name'],
'$photo' => $profile['photo'],
'$addr' => $profile['addr'] ?? '',
'$account_type' => $account_type,
'$about' => $profile['about'] ?? '',
'$about' => BBCode::convert($profile['about'] ?? ''),
]);
// If not there, create 'aside' empty

2
view/templates/profile/vcard.tpl
View File

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>

2
view/templates/widget/vcard.tpl
View File

@ -2,7 +2,7 @@
<div class="vcard h-card">
<div class="fn p-name">{{$name}}</div>
{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
{{if $about}}<div class="title p-job-title">{{$about}}</div>{{/if}}
{{if $about}}<div class="title p-job-title">{{$about nofilter}}</div>{{/if}}
{{if $url}}
<div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
{{else}}

2
view/theme/duepuntozero/templates/profile/vcard.tpl
View File

@ -5,7 +5,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

2
view/theme/frio/templates/profile/vcard.tpl
View File

@ -41,7 +41,7 @@
{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
</div>

2
view/theme/frio/templates/widget/vcard.tpl
View File

@ -30,7 +30,7 @@
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
{{if $about}}<div class="title">{{$about}}</div>{{/if}}
{{if $about}}<div class="title">{{$about nofilter}}</div>{{/if}}
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
</div>

2
view/theme/quattro/templates/profile/vcard.tpl
View File

@ -17,7 +17,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $about}}<div class="title">{{$profile.about}}</div>{{/if}}
{{if $about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}

2
view/theme/vier/templates/profile/vcard.tpl
View File

@ -11,7 +11,7 @@
{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about}}</div>{{/if}}
{{if $profile.about}}<div class="title">{{$profile.about nofilter}}</div>{{/if}}
{{if $profile.picdate}}
<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>