harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #683 - don't linkify homepage field without validating

Browse Source
This commit is contained in:
friendica 2014-11-10 19:20:23 -08:00
parent 5619902776
commit d432f4ccd5
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/identity.php
View File

@ -890,6 +890,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
|| (x($profile,'country_name') == 1)) || (x($profile,'country_name') == 1))
$location = t('Location:'); $location = t('Location:');
$profile['homepage'] = linkify($profile['homepage']);
$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
$marital = ((x($profile,'marital') == 1) ? t('Status:') : False); $marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);

2
mod/profiles.php
View File

@ -514,6 +514,8 @@ function profiles_post(&$a) {
} }
if($is_default) { if($is_default) {
// reload the info for the sidebar widget - why does this not work?
profile_load($a,$channel['channel_address']);
proc_run('php','include/directory.php',local_user()); proc_run('php','include/directory.php',local_user());
} }
} }

2
view/tpl/profile_vcard.tpl
View File

@ -41,7 +41,7 @@
{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}} {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
{{if $diaspora}} {{if $diaspora}}
{{include file="diaspora_vcard.tpl"}} {{include file="diaspora_vcard.tpl"}}