aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-22 18:00:18 -0700
committerredmatrix <git@macgirvin.com>2016-06-22 18:00:18 -0700
commitec8091a102b9cb2f8f47ef87982533bcd5ba9886 (patch)
treeb02ddad387f2668bb931d5d441acc8133e9a39b2
parentf48b12ff52c4fda85c09c1cc476f7cf4c0cfb649 (diff)
downloadvolse-hubzilla-ec8091a102b9cb2f8f47ef87982533bcd5ba9886.tar.gz
volse-hubzilla-ec8091a102b9cb2f8f47ef87982533bcd5ba9886.tar.bz2
volse-hubzilla-ec8091a102b9cb2f8f47ef87982533bcd5ba9886.zip
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
-rw-r--r--include/channel.php2
-rw-r--r--include/widgets.php2
-rwxr-xr-xview/tpl/profile_vcard.tpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php
index 562aedddc..a0424ee39 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -862,7 +862,7 @@ function profile_load(&$a, $nickname, $profile = '') {
);
if($z) {
$p[0]['picdate'] = $z[0]['xchan_photo_date'];
- $p[0]['reddress'] = str_replace('@','&#xff20;',$z[0]['xchan_addr']);
+ $p[0]['reddress'] = str_replace('@','&#x40;',$z[0]['xchan_addr']);
}
// fetch user tags if this isn't the default profile
diff --git a/include/widgets.php b/include/widgets.php
index cdd5d72ab..8a7f4b69f 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1158,7 +1158,7 @@ function widget_cover_photo($arr) {
if(array_key_exists('subtitle', $arr) && isset($arr['subtitle']))
$subtitle = $arr['subtitle'];
else
- $subtitle = $channel['xchan_addr'];
+ $subtitle = str_replace('@','&#x40;',$channel['xchan_addr']);
$c = get_cover_photo($channel_id,'html');
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 626649784..5e9d192a1 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -26,7 +26,7 @@
{{if ! $zcard}}
<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
- {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}
+ {{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}
{{/if}}
{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
{{if $location}}